Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 06324664 authored by Kees Cook's avatar Kees Cook Committed by Linus Torvalds
Browse files

format-security: move static strings to const 

While examining output from trial builds with -Wformat-security enabled,
many strings were found that should be defined as "const", or as a char
array instead of char pointer.  This makes some static analysis easier,
by producing fewer false positives.

As these are all trivial changes, it seemed best to put them all in a
single patch rather than chopping them up per maintainer.

Link: http://lkml.kernel.org/r/20170405214711.GA5711@beast


Signed-off-by: default avatarKees Cook <keescook@chromium.org>
Acked-by: Jes Sorensen <jes@trained-monkey.org>	[runner.c]
Cc: Tony Lindgren <tony@atomide.com>
Cc: Russell King <linux@armlinux.org.uk>
Cc: "Maciej W. Rozycki" <macro@linux-mips.org>
Cc: Ralf Baechle <ralf@linux-mips.org>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: "Rafael J. Wysocki" <rjw@rjwysocki.net>
Cc: Viresh Kumar <viresh.kumar@linaro.org>
Cc: Daniel Vetter <daniel.vetter@intel.com>
Cc: Jani Nikula <jani.nikula@linux.intel.com>
Cc: Sean Paul <seanpaul@chromium.org>
Cc: David Airlie <airlied@linux.ie>
Cc: Yisen Zhuang <yisen.zhuang@huawei.com>
Cc: Salil Mehta <salil.mehta@huawei.com>
Cc: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
Cc: Jiri Slaby <jslaby@suse.com>
Cc: Patrice Chotard <patrice.chotard@st.com>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: James Hogan <james.hogan@imgtec.com>
Cc: Paul Burton <paul.burton@imgtec.com>
Cc: Matt Redfearn <matt.redfearn@imgtec.com>
Cc: Paolo Bonzini <pbonzini@redhat.com>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Rasmus Villemoes <linux@rasmusvillemoes.dk>
Cc: Mugunthan V N <mugunthanvnm@ti.com>
Cc: Felipe Balbi <felipe.balbi@linux.intel.com>
Cc: Jarod Wilson <jarod@redhat.com>
Cc: Florian Westphal <fw@strlen.de>
Cc: Antonio Quartulli <a@unstable.cc>
Cc: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Cc: Kejian Yan <yankejian@huawei.com>
Cc: Daode Huang <huangdaode@hisilicon.com>
Cc: Qianqian Xie <xieqianqian@huawei.com>
Cc: Philippe Reynes <tremyfr@gmail.com>
Cc: Colin Ian King <colin.king@canonical.com>
Cc: Eric Dumazet <edumazet@google.com>
Cc: Christian Gromm <christian.gromm@microchip.com>
Cc: Andrey Shvetsov <andrey.shvetsov@k2l.de>
Cc: Jason Litzinger <jlitzingerdev@gmail.com>
Cc: WANG Cong <xiyou.wangcong@gmail.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 929f9d28

arch/arm/mach-omap2/board-n8x0.c

+1 −1
Original line number Diff line number Diff line
@@ -117,7 +117,7 @@ static struct musb_hdrc_platform_data tusb_data = { 
static void __init n8x0_usb_init(void)

{

	int ret = 0;

	static char	announce[] __initdata = KERN_INFO "TUSB 6010\n";

	static const char announce[] __initconst = KERN_INFO "TUSB 6010\n";



	/* PM companion chip power control pin */

	ret = gpio_request_one(TUSB6010_GPIO_ENABLE, GPIOF_OUT_INIT_LOW,

arch/mips/dec/prom/init.c

+3 −3
Original line number Diff line number Diff line
@@ -88,7 +88,7 @@ void __init which_prom(s32 magic, s32 *prom_vec) 
void __init prom_init(void)

{

	extern void dec_machine_halt(void);

	static char cpu_msg[] __initdata =

	static const char cpu_msg[] __initconst =

		"Sorry, this kernel is compiled for a wrong CPU type!\n";

	s32 argc = fw_arg0;

	s32 *argv = (void *)fw_arg1;
@@ -111,7 +111,7 @@ void __init prom_init(void) 
#if defined(CONFIG_CPU_R3000)

	if ((current_cpu_type() == CPU_R4000SC) ||

	    (current_cpu_type() == CPU_R4400SC)) {

		static char r4k_msg[] __initdata =

		static const char r4k_msg[] __initconst =

			"Please recompile with \"CONFIG_CPU_R4x00 = y\".\n";

		printk(cpu_msg);

		printk(r4k_msg);
@@ -122,7 +122,7 @@ void __init prom_init(void) 
#if defined(CONFIG_CPU_R4X00)

	if ((current_cpu_type() == CPU_R3000) ||

	    (current_cpu_type() == CPU_R3000A)) {

		static char r3k_msg[] __initdata =

		static const char r3k_msg[] __initconst =

			"Please recompile with \"CONFIG_CPU_R3000 = y\".\n";

		printk(cpu_msg);

		printk(r3k_msg);

arch/mips/kernel/traps.c

+2 −2
Original line number Diff line number Diff line
@@ -2256,8 +2256,8 @@ void set_handler(unsigned long offset, void *addr, unsigned long size) 
	local_flush_icache_range(ebase + offset, ebase + offset + size);

}



static char panic_null_cerr[] =

	"Trying to set NULL cache error exception handler";

static const char panic_null_cerr[] =

	"Trying to set NULL cache error exception handler\n";



/*

 * Install uncached CPU exception handler.

drivers/char/dsp56k.c

+1 −1
Original line number Diff line number Diff line
@@ -489,7 +489,7 @@ static const struct file_operations dsp56k_fops = { 


/****** Init and module functions ******/



static char banner[] __initdata = KERN_INFO "DSP56k driver installed\n";

static const char banner[] __initconst = KERN_INFO "DSP56k driver installed\n";



static int __init dsp56k_init_driver(void)

{

drivers/cpufreq/powernow-k8.c

+2 −1
Original line number Diff line number Diff line
@@ -1171,7 +1171,8 @@ static struct cpufreq_driver cpufreq_amd64_driver = { 


static void __request_acpi_cpufreq(void)

{

	const char *cur_drv, *drv = "acpi-cpufreq";

	const char drv[] = "acpi-cpufreq";

	const char *cur_drv;



	cur_drv = cpufreq_get_current_driver();

	if (!cur_drv)