* linux/pcmcia-cs/clients/axnet_cs.c (axdev_init): Add a format string
literal where printk only has a single variable argument.
* linux/src/drivers/net/3c507.c (el16_probe1): Likewise.
* linux/src/drivers/net/3c509.c (el3_probe): Likewise.
* linux/src/drivers/net/3c515.c (init_module): Likewise.
(tc515_probe): Likewise.
* linux/src/drivers/net/ac3200.c (ac_probe1): Likewise.
* linux/src/drivers/net/apricot.c (apricot_probe): Likewise.
* linux/src/drivers/net/at1700.c (at1700_probe1): Likewise.
* linux/src/drivers/net/de4x5.c (de4x5_hw_init): Likewise.
* linux/src/drivers/net/de600.c (de600_probe): Likewise.
* linux/src/drivers/net/de620.c (de620_probe): Likewise.
* linux/src/drivers/net/depca.c (depca_hw_init): Likewise.
* linux/src/drivers/net/e2100.c (e21_probe1): Likewise.
* linux/src/drivers/net/eepro.c (eepro_probe1): Likewise.
* linux/src/drivers/net/eepro100.c (speedo_found1): Likewise.
* linux/src/drivers/net/eexpress.c (eexp_hw_probe): Likewise.
* linux/src/drivers/net/ewrk3.c (ewrk3_hw_init): Likewise.
* linux/src/drivers/net/fmv18x.c (fmv18x_probe1): Likewise.
* linux/src/drivers/net/hp-plus.c (hpp_probe1): Likewise.
* linux/src/drivers/net/hp.c (hp_probe1): Likewise.
* linux/src/drivers/net/lance.c (lance_probe1): Likewise.
* linux/src/drivers/net/ne.c (ne_probe1): Likewise.
* linux/src/drivers/net/pcnet32.c (pcnet32_probe1): Likewise.
* linux/src/drivers/net/seeq8005.c (seeq8005_probe1): Likewise.
* linux/src/drivers/net/smc-ultra.c (ultra_probe1): Likewise.
* linux/src/drivers/net/smc-ultra32.c (ultra32_probe1): Likewise.
* linux/src/drivers/net/wd.c (wd_probe1): Likewise.
---
Hi,
I tried building on the Fedora 21 beta, and -Werror=format-security is
now in the default CFLAGS. It gets hung up on a few files in the
included Linux drivers, so this is a quick patch to remedy those
issues. It's basically just s/printk(version/printk("%s", version/.
Appending -Wno-error=format-security to CFLAGS works, so this isn't
really important, but it would be nice to have.
Thanks.
David
linux/pcmcia-cs/clients/axnet_cs.c | 2 +-
linux/src/drivers/net/3c507.c | 4 ++--
linux/src/drivers/net/3c509.c | 2 +-
linux/src/drivers/net/3c515.c | 4 ++--
linux/src/drivers/net/ac3200.c | 2 +-
linux/src/drivers/net/apricot.c | 2 +-
linux/src/drivers/net/at1700.c | 2 +-
linux/src/drivers/net/de4x5.c | 2 +-
linux/src/drivers/net/de600.c | 2 +-
linux/src/drivers/net/de620.c | 2 +-
linux/src/drivers/net/depca.c | 2 +-
linux/src/drivers/net/e2100.c | 2 +-
linux/src/drivers/net/eepro.c | 2 +-
linux/src/drivers/net/eepro100.c| 2 +-
linux/src/drivers/net/eexpress.c| 2 +-
linux/src/drivers/net/ewrk3.c | 2 +-
linux/src/drivers/net/fmv18x.c | 2 +-
linux/src/drivers/net/hp-plus.c | 2 +-
linux/src/drivers/net/hp.c | 2 +-
linux/src/drivers/net/lance.c | 2 +-
linux/src/drivers/net/ne.c | 2 +-
linux/src/drivers/net/pcnet32.c | 2 +-
linux/src/drivers/net/seeq8005.c| 2 +-
linux/src/drivers/net/smc-ultra.c | 2 +-
linux/src/drivers/net/smc-ultra32.c | 2 +-
linux/src/drivers/net/wd.c | 2 +-
26 files changed, 28 insertions(+), 28 deletions(-)
diff --git a/linux/pcmcia-cs/clients/axnet_cs.c
b/linux/pcmcia-cs/clients/axnet_cs.c
index bcd79b0..2e7d9ed 100644
--- a/linux/pcmcia-cs/clients/axnet_cs.c
+++ b/linux/pcmcia-cs/clients/axnet_cs.c
@@ -1814,7 +1814,7 @@ static void set_multicast_list(struct net_device *dev)
static int axdev_init(struct net_device *dev)
{
if (ei_debug > 1)
- printk(version_8390);
+ printk("%s", version_8390);
if (dev->priv == NULL)
{
diff --git a/linux/src/drivers/net/3c507.c b/linux/src/drivers/net/3c507.c
index 63f85a4..58ba2d7 100644
--- a/linux/src/drivers/net/3c507.c
+++ b/linux/src/drivers/net/3c507.c
@@ -354,7 +354,7 @@ int el16_probe1(struct device *dev, int ioaddr)
dev = init_etherdev(0, sizeof(struct net_local));
if (net_debug && version_printed++ == 0)
- printk(version);
+ printk("%s", version);
printk("%s: 3c507 at %#x,", dev->name, ioaddr);
@@ -410,7 +410,7 @@ int el16_probe1(struct device *dev, int ioaddr)
dev->if_port ? "ex" : "in", dev->mem_start, dev->mem_end-1);
if (net_debug)
- printk(version);
+ printk("%s", version);
/* Initialize the device structure. */
dev->priv = kmalloc(sizeof(struct net_local), GFP_KERNEL);
diff --git a/linux/src/drivers/net/3c509.c b/linux/src/drivers/net/3c509.c
index f884288..727595c 100644
--- a/linux/src/drivers/net/3c509.c
+++ b/linux/src/drivers/net/3c509.c
@@ -314,7 +314,7 @@ int el3_probe(struct device *dev)
el3_root_dev = dev;
if (el3_debug > 0)
- printk(version);
+ printk("%s", version);
/* The EL3-specific entries in the device structure. */
