Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-03 17:41:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

format-security: move static strings to const

Browse Source 
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: Kees 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: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Kees Cook 2017-05-08 15:59:05 -07:00 committed by Linus Torvalds
parent 929f9d285a
commit 063246641d
19 changed files with 31 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/mach-omap2/board-n8x0.c
View File

@ -117,7 +117,7 @@ static struct musb_hdrc_platform_data tusb_data = {
static void __init n8x0_usb_init(void) static void __init n8x0_usb_init(void)
{ {
int ret = 0; 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 */ /* PM companion chip power control pin */
ret = gpio_request_one(TUSB6010_GPIO_ENABLE, GPIOF_OUT_INIT_LOW, ret = gpio_request_one(TUSB6010_GPIO_ENABLE, GPIOF_OUT_INIT_LOW,

6
arch/mips/dec/prom/init.c
View File

@ -88,7 +88,7 @@ void __init which_prom(s32 magic, s32 *prom_vec)
void __init prom_init(void) void __init prom_init(void)
{ {
extern void dec_machine_halt(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"; "Sorry, this kernel is compiled for a wrong CPU type!\n";
s32 argc = fw_arg0; s32 argc = fw_arg0;
s32 *argv = (void *)fw_arg1; s32 *argv = (void *)fw_arg1;
@ -111,7 +111,7 @@ void __init prom_init(void)
#if defined(CONFIG_CPU_R3000) #if defined(CONFIG_CPU_R3000)
if ((current_cpu_type() == CPU_R4000SC) || if ((current_cpu_type() == CPU_R4000SC) ||
(current_cpu_type() == CPU_R4400SC)) { (current_cpu_type() == CPU_R4400SC)) {
static char r4k_msg[] __initdata = static const char r4k_msg[] __initconst =
"Please recompile with \"CONFIG_CPU_R4x00 = y\".\n"; "Please recompile with \"CONFIG_CPU_R4x00 = y\".\n";
printk(cpu_msg); printk(cpu_msg);
printk(r4k_msg); printk(r4k_msg);
@ -122,7 +122,7 @@ void __init prom_init(void)
#if defined(CONFIG_CPU_R4X00) #if defined(CONFIG_CPU_R4X00)
if ((current_cpu_type() == CPU_R3000) || if ((current_cpu_type() == CPU_R3000) ||
(current_cpu_type() == CPU_R3000A)) { (current_cpu_type() == CPU_R3000A)) {
static char r3k_msg[] __initdata = static const char r3k_msg[] __initconst =
"Please recompile with \"CONFIG_CPU_R3000 = y\".\n"; "Please recompile with \"CONFIG_CPU_R3000 = y\".\n";
printk(cpu_msg); printk(cpu_msg);
printk(r3k_msg); printk(r3k_msg);

4
arch/mips/kernel/traps.c
View File

@ -2256,8 +2256,8 @@ void set_handler(unsigned long offset, void *addr, unsigned long size)
local_flush_icache_range(ebase + offset, ebase + offset + size); local_flush_icache_range(ebase + offset, ebase + offset + size);
} }
static char panic_null_cerr[] = static const char panic_null_cerr[] =
"Trying to set NULL cache error exception handler"; "Trying to set NULL cache error exception handler\n";
/* /*
* Install uncached CPU exception handler. * Install uncached CPU exception handler.

2
drivers/char/dsp56k.c
View File

@ -489,7 +489,7 @@ static const struct file_operations dsp56k_fops = {
/****** Init and module functions ******/ /****** 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) static int __init dsp56k_init_driver(void)
{ {

3
drivers/cpufreq/powernow-k8.c
View File

@ -1171,7 +1171,8 @@ static struct cpufreq_driver cpufreq_amd64_driver = {
static void __request_acpi_cpufreq(void) 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(); cur_drv = cpufreq_get_current_driver();
if (!cur_drv) if (!cur_drv)

2
drivers/gpu/drm/drm_fb_helper.c
View File

@ -2446,7 +2446,7 @@ EXPORT_SYMBOL(drm_fb_helper_hotplug_event);
int __init drm_fb_helper_modinit(void) int __init drm_fb_helper_modinit(void)
{ {
#if defined(CONFIG_FRAMEBUFFER_CONSOLE_MODULE) && !defined(CONFIG_EXPERT) #if defined(CONFIG_FRAMEBUFFER_CONSOLE_MODULE) && !defined(CONFIG_EXPERT)
const char *name = "fbcon"; const char name[] = "fbcon";
struct module *fbcon; struct module *fbcon;
mutex_lock(&module_mutex); mutex_lock(&module_mutex);

4
drivers/net/ethernet/amd/atarilance.c
View File

@ -42,8 +42,8 @@
*/ */
static char version[] = "atarilance.c: v1.3 04/04/96 " static const char version[] = "atarilance.c: v1.3 04/04/96 "
"Roman.Hodek@informatik.uni-erlangen.de\n"; "Roman.Hodek@informatik.uni-erlangen.de\n";
#include <linux/netdevice.h> #include <linux/netdevice.h>
#include <linux/etherdevice.h> #include <linux/etherdevice.h>

2
drivers/net/ethernet/amd/declance.c
View File

@ -72,7 +72,7 @@
#include <asm/dec/machtype.h> #include <asm/dec/machtype.h>
#include <asm/dec/system.h> #include <asm/dec/system.h>
static char version[] = static const char version[] =
"declance.c: v0.011 by Linux MIPS DECstation task force\n"; "declance.c: v0.011 by Linux MIPS DECstation task force\n";
MODULE_AUTHOR("Linux MIPS DECstation task force"); MODULE_AUTHOR("Linux MIPS DECstation task force");

3
drivers/net/ethernet/amd/sun3lance.c
View File

@ -21,7 +21,8 @@
*/ */
static char *version = "sun3lance.c: v1.2 1/12/2001 Sam Creasey (sammy@sammy.net)\n"; static const char version[] =
"sun3lance.c: v1.2 1/12/2001 Sam Creasey (sammy@sammy.net)\n";
#include <linux/module.h> #include <linux/module.h>
#include <linux/stddef.h> #include <linux/stddef.h>

2
drivers/net/ethernet/cirrus/mac89x0.c
View File

@ -56,7 +56,7 @@
local_irq_{dis,en}able() local_irq_{dis,en}able()
*/ */
static char *version = static const char version[] =
"cs89x0.c:v1.02 11/26/96 Russell Nelson <nelson@crynwr.com>\n"; "cs89x0.c:v1.02 11/26/96 Russell Nelson <nelson@crynwr.com>\n";
/* ======================= configure the driver here ======================= */ /* ======================= configure the driver here ======================= */

2
drivers/net/ethernet/hisilicon/hns/hns_dsaf_mac.h
View File

@ -405,7 +405,7 @@ struct mac_driver {
}; };
struct mac_stats_string { struct mac_stats_string {
char desc[ETH_GSTRING_LEN]; const char desc[ETH_GSTRING_LEN];
unsigned long offset; unsigned long offset;
}; };

2
drivers/net/ethernet/natsemi/sonic.h
View File

@ -444,7 +444,7 @@ static inline __u16 sonic_rra_get(struct net_device* dev, int entry,
(entry * SIZEOF_SONIC_RR) + offset); (entry * SIZEOF_SONIC_RR) + offset);
} }
static const char *version = static const char version[] =
"sonic.c:v0.92 20.9.98 tsbogend@alpha.franken.de\n"; "sonic.c:v0.92 20.9.98 tsbogend@alpha.franken.de\n";
#endif /* SONIC_H */ #endif /* SONIC_H */

2
drivers/net/ethernet/toshiba/tc35815.c
View File

@ -23,7 +23,7 @@
*/ */
#define DRV_VERSION "1.39" #define DRV_VERSION "1.39"
static const char *version = "tc35815.c:v" DRV_VERSION "\n"; static const char version[] = "tc35815.c:v" DRV_VERSION "\n";
#define MODNAME "tc35815" #define MODNAME "tc35815"
#include <linux/module.h> #include <linux/module.h>

2
drivers/net/fddi/defxx.c
View File

@ -228,7 +228,7 @@
#define DRV_VERSION "v1.11" #define DRV_VERSION "v1.11"
#define DRV_RELDATE "2014/07/01" #define DRV_RELDATE "2014/07/01"
static char version[] = static const char version[] =
DRV_NAME ": " DRV_VERSION " " DRV_RELDATE DRV_NAME ": " DRV_VERSION " " DRV_RELDATE
" Lawrence V. Stefani and others\n"; " Lawrence V. Stefani and others\n";

3
drivers/net/hippi/rrunner.c
View File

@ -60,7 +60,8 @@ MODULE_AUTHOR("Jes Sorensen <jes@wildopensource.com>");
MODULE_DESCRIPTION("Essential RoadRunner HIPPI driver"); MODULE_DESCRIPTION("Essential RoadRunner HIPPI driver");
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
static char version[] = "rrunner.c: v0.50 11/11/2002 Jes Sorensen (jes@wildopensource.com)\n"; static const char version[] =
"rrunner.c: v0.50 11/11/2002 Jes Sorensen (jes@wildopensource.com)\n";
static const struct net_device_ops rr_netdev_ops = { static const struct net_device_ops rr_netdev_ops = {

2
drivers/staging/most/mostcore/core.c
View File

@ -82,7 +82,7 @@ struct most_inst_obj {
static const struct { static const struct {
int most_ch_data_type; int most_ch_data_type;
char *name; const char *name;
} ch_data_type[] = { } ch_data_type[] = {
{ MOST_CH_CONTROL, "control\n" }, { MOST_CH_CONTROL, "control\n" },
{ MOST_CH_ASYNC, "async\n" }, { MOST_CH_ASYNC, "async\n" },

10
drivers/tty/n_hdlc.c
View File

@ -939,11 +939,11 @@ static struct n_hdlc_buf *n_hdlc_buf_get(struct n_hdlc_buf_list *buf_list)
return buf; return buf;
} /* end of n_hdlc_buf_get() */ } /* end of n_hdlc_buf_get() */
static char hdlc_banner[] __initdata = static const char hdlc_banner[] __initconst =
KERN_INFO "HDLC line discipline maxframe=%u\n"; KERN_INFO "HDLC line discipline maxframe=%u\n";
static char hdlc_register_ok[] __initdata = static const char hdlc_register_ok[] __initconst =
KERN_INFO "N_HDLC line discipline registered.\n"; KERN_INFO "N_HDLC line discipline registered.\n";
static char hdlc_register_fail[] __initdata = static const char hdlc_register_fail[] __initconst =
KERN_ERR "error registering line discipline: %d\n"; KERN_ERR "error registering line discipline: %d\n";
static int __init n_hdlc_init(void) static int __init n_hdlc_init(void)
@ -968,9 +968,9 @@ static int __init n_hdlc_init(void)
} /* end of init_module() */ } /* end of init_module() */
static char hdlc_unregister_ok[] __exitdata = static const char hdlc_unregister_ok[] __exitdata =
KERN_INFO "N_HDLC: line discipline unregistered\n"; KERN_INFO "N_HDLC: line discipline unregistered\n";
static char hdlc_unregister_fail[] __exitdata = static const char hdlc_unregister_fail[] __exitdata =
KERN_ERR "N_HDLC: can't unregister line discipline (err = %d)\n"; KERN_ERR "N_HDLC: can't unregister line discipline (err = %d)\n";
static void __exit n_hdlc_exit(void) static void __exit n_hdlc_exit(void)

2
drivers/tty/serial/st-asc.c
View File

@ -986,7 +986,7 @@ static struct platform_driver asc_serial_driver = {
static int __init asc_init(void) static int __init asc_init(void)
{ {
int ret; int ret;
static char banner[] __initdata = static const char banner[] __initconst =
KERN_INFO "STMicroelectronics ASC driver initialized\n"; KERN_INFO "STMicroelectronics ASC driver initialized\n";
printk(banner); printk(banner);

3
net/decnet/af_decnet.c
View File

@ -2361,7 +2361,8 @@ MODULE_AUTHOR("Linux DECnet Project Team");
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
MODULE_ALIAS_NETPROTO(PF_DECnet); MODULE_ALIAS_NETPROTO(PF_DECnet);
static char banner[] __initdata = KERN_INFO "NET4: DECnet for Linux: V.2.5.68s (C) 1995-2003 Linux DECnet Project Team\n"; static const char banner[] __initconst = KERN_INFO
"NET4: DECnet for Linux: V.2.5.68s (C) 1995-2003 Linux DECnet Project Team\n";
static int __init decnet_init(void) static int __init decnet_init(void)
{ {