aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Howells <dhowells@redhat.com>2017-04-04 11:54:26 -0400
committerDavid Howells <dhowells@redhat.com>2017-04-20 07:02:32 -0400
commitdf29840815a6aaa6a1ab8d85d7745a1a6fc25de0 (patch)
treea136f12e73075fb30525de0adfa6c9e17c36a7f9
parente43f2c52a07793cb97e4a963a5b90d4af311c3d5 (diff)
Annotate hardware config module parameters in drivers/net/ethernet/
When the kernel is running in secure boot mode, we lock down the kernel to prevent userspace from modifying the running kernel image. Whilst this includes prohibiting access to things like /dev/mem, it must also prevent access by means of configuring driver modules in such a way as to cause a device to access or modify the kernel image. To this end, annotate module_param* statements that refer to hardware configuration and indicate for future reference what type of parameter they specify. The parameter parser in the core sees this information and can skip such parameters with an error message if the kernel is locked down. The module initialisation then runs as normal, but just sees whatever the default values for those parameters is. Note that we do still need to do the module initialisation because some drivers have viable defaults set in case parameters aren't specified and some drivers support automatic configuration (e.g. PNP or PCI) in addition to manually coded parameters. This patch annotates drivers in drivers/net/ethernet/. Suggested-by: Alan Cox <gnomes@lxorguk.ukuu.org.uk> Signed-off-by: David Howells <dhowells@redhat.com> cc: Steffen Klassert <steffen.klassert@secunet.com> cc: Jaroslav Kysela <perex@perex.cz> cc: netdev@vger.kernel.org cc: linux-parisc@vger.kernel.org
-rw-r--r--drivers/net/ethernet/3com/3c509.c2
-rw-r--r--drivers/net/ethernet/3com/3c59x.c4
-rw-r--r--drivers/net/ethernet/8390/ne.c4
-rw-r--r--drivers/net/ethernet/8390/smc-ultra.c4
-rw-r--r--drivers/net/ethernet/8390/wd.c8
-rw-r--r--drivers/net/ethernet/amd/lance.c6
-rw-r--r--drivers/net/ethernet/amd/ni65.c6
-rw-r--r--drivers/net/ethernet/cirrus/cs89x0.c6
-rw-r--r--drivers/net/ethernet/dec/tulip/de4x5.c2
-rw-r--r--drivers/net/ethernet/hp/hp100.c2
-rw-r--r--drivers/net/ethernet/realtek/atp.c4
-rw-r--r--drivers/net/ethernet/smsc/smc9194.c4
12 files changed, 26 insertions, 26 deletions
diff --git a/drivers/net/ethernet/3com/3c509.c b/drivers/net/ethernet/3com/3c509.c
index c7f9f2c77da7..db8592d412ab 100644
--- a/drivers/net/ethernet/3com/3c509.c
+++ b/drivers/net/ethernet/3com/3c509.c
@@ -1371,7 +1371,7 @@ el3_resume(struct device *pdev)
1371#endif /* CONFIG_PM */ 1371#endif /* CONFIG_PM */
1372 1372
1373module_param(debug,int, 0); 1373module_param(debug,int, 0);
1374module_param_array(irq, int, NULL, 0); 1374module_param_hw_array(irq, int, irq, NULL, 0);
1375module_param(max_interrupt_work, int, 0); 1375module_param(max_interrupt_work, int, 0);
1376MODULE_PARM_DESC(debug, "debug level (0-6)"); 1376MODULE_PARM_DESC(debug, "debug level (0-6)");
1377MODULE_PARM_DESC(irq, "IRQ number(s) (assigned)"); 1377MODULE_PARM_DESC(irq, "IRQ number(s) (assigned)");
diff --git a/drivers/net/ethernet/3com/3c59x.c b/drivers/net/ethernet/3com/3c59x.c
index 40196f41768a..e41245a54f8b 100644
--- a/drivers/net/ethernet/3com/3c59x.c
+++ b/drivers/net/ethernet/3com/3c59x.c
@@ -813,8 +813,8 @@ module_param(global_enable_wol, int, 0);
813module_param_array(enable_wol, int, NULL, 0); 813module_param_array(enable_wol, int, NULL, 0);
814module_param(rx_copybreak, int, 0); 814module_param(rx_copybreak, int, 0);
815module_param(max_interrupt_work, int, 0); 815module_param(max_interrupt_work, int, 0);
816module_param(compaq_ioaddr, int, 0); 816module_param_hw(compaq_ioaddr, int, ioport, 0);
817module_param(compaq_irq, int, 0); 817module_param_hw(compaq_irq, int, irq, 0);
818module_param(compaq_device_id, int, 0); 818module_param(compaq_device_id, int, 0);
819module_param(watchdog, int, 0); 819module_param(watchdog, int, 0);
820module_param(global_use_mmio, int, 0); 820module_param(global_use_mmio, int, 0);
diff --git a/drivers/net/ethernet/8390/ne.c b/drivers/net/ethernet/8390/ne.c
index c063b410a163..66f47987e2a2 100644
--- a/drivers/net/ethernet/8390/ne.c
+++ b/drivers/net/ethernet/8390/ne.c
@@ -74,8 +74,8 @@ static int bad[MAX_NE_CARDS];
74static u32 ne_msg_enable; 74static u32 ne_msg_enable;
75 75
76#ifdef MODULE 76#ifdef MODULE
77module_param_array(io, int, NULL, 0); 77module_param_hw_array(io, int, ioport, NULL, 0);
78module_param_array(irq, int, NULL, 0); 78module_param_hw_array(irq, int, irq, NULL, 0);
79module_param_array(bad, int, NULL, 0); 79module_param_array(bad, int, NULL, 0);
80module_param_named(msg_enable, ne_msg_enable, uint, (S_IRUSR|S_IRGRP|S_IROTH)); 80module_param_named(msg_enable, ne_msg_enable, uint, (S_IRUSR|S_IRGRP|S_IROTH));
81MODULE_PARM_DESC(io, "I/O base address(es),required"); 81MODULE_PARM_DESC(io, "I/O base address(es),required");
diff --git a/drivers/net/ethernet/8390/smc-ultra.c b/drivers/net/ethernet/8390/smc-ultra.c
index 364b6514f65f..4e02f6a23575 100644
--- a/drivers/net/ethernet/8390/smc-ultra.c
+++ b/drivers/net/ethernet/8390/smc-ultra.c
@@ -561,8 +561,8 @@ static struct net_device *dev_ultra[MAX_ULTRA_CARDS];
561static int io[MAX_ULTRA_CARDS]; 561static int io[MAX_ULTRA_CARDS];
562static int irq[MAX_ULTRA_CARDS]; 562static int irq[MAX_ULTRA_CARDS];
563 563
564module_param_array(io, int, NULL, 0); 564module_param_hw_array(io, int, ioport, NULL, 0);
565module_param_array(irq, int, NULL, 0); 565module_param_hw_array(irq, int, irq, NULL, 0);
566module_param_named(msg_enable, ultra_msg_enable, uint, (S_IRUSR|S_IRGRP|S_IROTH)); 566module_param_named(msg_enable, ultra_msg_enable, uint, (S_IRUSR|S_IRGRP|S_IROTH));
567MODULE_PARM_DESC(io, "I/O base address(es)"); 567MODULE_PARM_DESC(io, "I/O base address(es)");
568MODULE_PARM_DESC(irq, "IRQ number(s) (assigned)"); 568MODULE_PARM_DESC(irq, "IRQ number(s) (assigned)");
diff --git a/drivers/net/ethernet/8390/wd.c b/drivers/net/ethernet/8390/wd.c
index ad019cbc698f..6efa2722f850 100644
--- a/drivers/net/ethernet/8390/wd.c
+++ b/drivers/net/ethernet/8390/wd.c
@@ -503,10 +503,10 @@ static int irq[MAX_WD_CARDS];
503static int mem[MAX_WD_CARDS]; 503static int mem[MAX_WD_CARDS];
504static int mem_end[MAX_WD_CARDS]; /* for non std. mem size */ 504static int mem_end[MAX_WD_CARDS]; /* for non std. mem size */
505 505
506module_param_array(io, int, NULL, 0); 506module_param_hw_array(io, int, ioport, NULL, 0);
507module_param_array(irq, int, NULL, 0); 507module_param_hw_array(irq, int, irq, NULL, 0);
508module_param_array(mem, int, NULL, 0); 508module_param_hw_array(mem, int, iomem, NULL, 0);
509module_param_array(mem_end, int, NULL, 0); 509module_param_hw_array(mem_end, int, iomem, NULL, 0);
510module_param_named(msg_enable, wd_msg_enable, uint, (S_IRUSR|S_IRGRP|S_IROTH)); 510module_param_named(msg_enable, wd_msg_enable, uint, (S_IRUSR|S_IRGRP|S_IROTH));
511MODULE_PARM_DESC(io, "I/O base address(es)"); 511MODULE_PARM_DESC(io, "I/O base address(es)");
512MODULE_PARM_DESC(irq, "IRQ number(s) (ignored for PureData boards)"); 512MODULE_PARM_DESC(irq, "IRQ number(s) (ignored for PureData boards)");
diff --git a/drivers/net/ethernet/amd/lance.c b/drivers/net/ethernet/amd/lance.c
index 61a641f23149..12a6a93d221b 100644
--- a/drivers/net/ethernet/amd/lance.c
+++ b/drivers/net/ethernet/amd/lance.c
@@ -318,9 +318,9 @@ static int io[MAX_CARDS];
318static int dma[MAX_CARDS]; 318static int dma[MAX_CARDS];
319static int irq[MAX_CARDS]; 319static int irq[MAX_CARDS];
320 320
321module_param_array(io, int, NULL, 0); 321module_param_hw_array(io, int, ioport, NULL, 0);
322module_param_array(dma, int, NULL, 0); 322module_param_hw_array(dma, int, dma, NULL, 0);
323module_param_array(irq, int, NULL, 0); 323module_param_hw_array(irq, int, irq, NULL, 0);
324module_param(lance_debug, int, 0); 324module_param(lance_debug, int, 0);
325MODULE_PARM_DESC(io, "LANCE/PCnet I/O base address(es),required"); 325MODULE_PARM_DESC(io, "LANCE/PCnet I/O base address(es),required");
326MODULE_PARM_DESC(dma, "LANCE/PCnet ISA DMA channel (ignored for some devices)"); 326MODULE_PARM_DESC(dma, "LANCE/PCnet ISA DMA channel (ignored for some devices)");
diff --git a/drivers/net/ethernet/amd/ni65.c b/drivers/net/ethernet/amd/ni65.c
index 5985bf220a8d..e248d1ab3e47 100644
--- a/drivers/net/ethernet/amd/ni65.c
+++ b/drivers/net/ethernet/amd/ni65.c
@@ -1227,9 +1227,9 @@ static void set_multicast_list(struct net_device *dev)
1227#ifdef MODULE 1227#ifdef MODULE
1228static struct net_device *dev_ni65; 1228static struct net_device *dev_ni65;
1229 1229
1230module_param(irq, int, 0); 1230module_param_hw(irq, int, irq, 0);
1231module_param(io, int, 0); 1231module_param_hw(io, int, ioport, 0);
1232module_param(dma, int, 0); 1232module_param_hw(dma, int, dma, 0);
1233MODULE_PARM_DESC(irq, "ni6510 IRQ number (ignored for some cards)"); 1233MODULE_PARM_DESC(irq, "ni6510 IRQ number (ignored for some cards)");
1234MODULE_PARM_DESC(io, "ni6510 I/O base address"); 1234MODULE_PARM_DESC(io, "ni6510 I/O base address");
1235MODULE_PARM_DESC(dma, "ni6510 ISA DMA channel (ignored for some cards)"); 1235MODULE_PARM_DESC(dma, "ni6510 ISA DMA channel (ignored for some cards)");
diff --git a/drivers/net/ethernet/cirrus/cs89x0.c b/drivers/net/ethernet/cirrus/cs89x0.c
index 3647b28e8de0..8f660d9761cc 100644
--- a/drivers/net/ethernet/cirrus/cs89x0.c
+++ b/drivers/net/ethernet/cirrus/cs89x0.c
@@ -1704,12 +1704,12 @@ static int use_dma; /* These generate unused var warnings if ALLOW_DMA = 0 */
1704static int dma; 1704static int dma;
1705static int dmasize = 16; /* or 64 */ 1705static int dmasize = 16; /* or 64 */
1706 1706
1707module_param(io, int, 0); 1707module_param_hw(io, int, ioport, 0);
1708module_param(irq, int, 0); 1708module_param_hw(irq, int, irq, 0);
1709module_param(debug, int, 0); 1709module_param(debug, int, 0);
1710module_param_string(media, media, sizeof(media), 0); 1710module_param_string(media, media, sizeof(media), 0);
1711module_param(duplex, int, 0); 1711module_param(duplex, int, 0);
1712module_param(dma , int, 0); 1712module_param_hw(dma , int, dma, 0);
1713module_param(dmasize , int, 0); 1713module_param(dmasize , int, 0);
1714module_param(use_dma , int, 0); 1714module_param(use_dma , int, 0);
1715MODULE_PARM_DESC(io, "cs89x0 I/O base address"); 1715MODULE_PARM_DESC(io, "cs89x0 I/O base address");
diff --git a/drivers/net/ethernet/dec/tulip/de4x5.c b/drivers/net/ethernet/dec/tulip/de4x5.c
index df4a871df633..fd6bcf024729 100644
--- a/drivers/net/ethernet/dec/tulip/de4x5.c
+++ b/drivers/net/ethernet/dec/tulip/de4x5.c
@@ -1015,7 +1015,7 @@ static int compact_infoblock(struct net_device *dev, u_char count, u_char *p
1015 1015
1016static int io=0x0;/* EDIT THIS LINE FOR YOUR CONFIGURATION IF NEEDED */ 1016static int io=0x0;/* EDIT THIS LINE FOR YOUR CONFIGURATION IF NEEDED */
1017 1017
1018module_param(io, int, 0); 1018module_param_hw(io, int, ioport, 0);
1019module_param(de4x5_debug, int, 0); 1019module_param(de4x5_debug, int, 0);
1020module_param(dec_only, int, 0); 1020module_param(dec_only, int, 0);
1021module_param(args, charp, 0); 1021module_param(args, charp, 0);
diff --git a/drivers/net/ethernet/hp/hp100.c b/drivers/net/ethernet/hp/hp100.c
index 1a31bee6e728..5673b071e39d 100644
--- a/drivers/net/ethernet/hp/hp100.c
+++ b/drivers/net/ethernet/hp/hp100.c
@@ -2966,7 +2966,7 @@ MODULE_DESCRIPTION("HP CASCADE Architecture Driver for 100VG-AnyLan Network Adap
2966#define HP100_DEVICES 5 2966#define HP100_DEVICES 5
2967/* Parameters set by insmod */ 2967/* Parameters set by insmod */
2968static int hp100_port[HP100_DEVICES] = { 0, [1 ... (HP100_DEVICES-1)] = -1 }; 2968static int hp100_port[HP100_DEVICES] = { 0, [1 ... (HP100_DEVICES-1)] = -1 };
2969module_param_array(hp100_port, int, NULL, 0); 2969module_param_hw_array(hp100_port, int, ioport, NULL, 0);
2970 2970
2971/* List of devices */ 2971/* List of devices */
2972static struct net_device *hp100_devlist[HP100_DEVICES]; 2972static struct net_device *hp100_devlist[HP100_DEVICES];
diff --git a/drivers/net/ethernet/realtek/atp.c b/drivers/net/ethernet/realtek/atp.c
index 9bcd4aefc9c5..bed34684994f 100644
--- a/drivers/net/ethernet/realtek/atp.c
+++ b/drivers/net/ethernet/realtek/atp.c
@@ -151,8 +151,8 @@ MODULE_LICENSE("GPL");
151 151
152module_param(max_interrupt_work, int, 0); 152module_param(max_interrupt_work, int, 0);
153module_param(debug, int, 0); 153module_param(debug, int, 0);
154module_param_array(io, int, NULL, 0); 154module_param_hw_array(io, int, ioport, NULL, 0);
155module_param_array(irq, int, NULL, 0); 155module_param_hw_array(irq, int, irq, NULL, 0);
156module_param_array(xcvr, int, NULL, 0); 156module_param_array(xcvr, int, NULL, 0);
157MODULE_PARM_DESC(max_interrupt_work, "ATP maximum events handled per interrupt"); 157MODULE_PARM_DESC(max_interrupt_work, "ATP maximum events handled per interrupt");
158MODULE_PARM_DESC(debug, "ATP debug level (0-7)"); 158MODULE_PARM_DESC(debug, "ATP debug level (0-7)");
diff --git a/drivers/net/ethernet/smsc/smc9194.c b/drivers/net/ethernet/smsc/smc9194.c
index c8d84679ede7..d3bb2ba51f40 100644
--- a/drivers/net/ethernet/smsc/smc9194.c
+++ b/drivers/net/ethernet/smsc/smc9194.c
@@ -1501,8 +1501,8 @@ static void smc_set_multicast_list(struct net_device *dev)
1501static struct net_device *devSMC9194; 1501static struct net_device *devSMC9194;
1502MODULE_LICENSE("GPL"); 1502MODULE_LICENSE("GPL");
1503 1503
1504module_param(io, int, 0); 1504module_param_hw(io, int, ioport, 0);
1505module_param(irq, int, 0); 1505module_param_hw(irq, int, irq, 0);
1506module_param(ifport, int, 0); 1506module_param(ifport, int, 0);
1507MODULE_PARM_DESC(io, "SMC 99194 I/O base address"); 1507MODULE_PARM_DESC(io, "SMC 99194 I/O base address");
1508MODULE_PARM_DESC(irq, "SMC 99194 IRQ number"); 1508MODULE_PARM_DESC(irq, "SMC 99194 IRQ number");