p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Annotate hardware config module parameters in drivers/net/irda/ 

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/irda/.

Suggested-by: Alan Cox <gnomes@lxorguk.ukuu.org.uk>
Signed-off-by: David Howells <dhowells@redhat.com>
cc: Samuel Ortiz <samuel@sortiz.org>
cc: netdev@vger.kernel.org
This commit is contained in:
David Howells 2017-04-04 16:54:26 +01:00
parent b658e5d854
commit 4f06e65272
4 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/net/irda/ali-ircc.c
View File

@ -2207,11 +2207,11 @@ MODULE_LICENSE("GPL");
MODULE_ALIAS("platform:" ALI_IRCC_DRIVER_NAME); MODULE_ALIAS("platform:" ALI_IRCC_DRIVER_NAME);
module_param_array(io, int, NULL, 0); module_param_hw_array(io, int, ioport, NULL, 0);
MODULE_PARM_DESC(io, "Base I/O addresses"); MODULE_PARM_DESC(io, "Base I/O addresses");
module_param_array(irq, int, NULL, 0); module_param_hw_array(irq, int, irq, NULL, 0);
MODULE_PARM_DESC(irq, "IRQ lines"); MODULE_PARM_DESC(irq, "IRQ lines");
module_param_array(dma, int, NULL, 0); module_param_hw_array(dma, int, dma, NULL, 0);
MODULE_PARM_DESC(dma, "DMA channels"); MODULE_PARM_DESC(dma, "DMA channels");
module_init(ali_ircc_init); module_init(ali_ircc_init);

6
drivers/net/irda/nsc-ircc.c
View File

@ -2396,11 +2396,11 @@ MODULE_LICENSE("GPL");
module_param(qos_mtt_bits, int, 0); module_param(qos_mtt_bits, int, 0);
MODULE_PARM_DESC(qos_mtt_bits, "Minimum Turn Time"); MODULE_PARM_DESC(qos_mtt_bits, "Minimum Turn Time");
module_param_array(io, int, NULL, 0); module_param_hw_array(io, int, ioport, NULL, 0);
MODULE_PARM_DESC(io, "Base I/O addresses"); MODULE_PARM_DESC(io, "Base I/O addresses");
module_param_array(irq, int, NULL, 0); module_param_hw_array(irq, int, irq, NULL, 0);
MODULE_PARM_DESC(irq, "IRQ lines"); MODULE_PARM_DESC(irq, "IRQ lines");
module_param_array(dma, int, NULL, 0); module_param_hw_array(dma, int, dma, NULL, 0);
MODULE_PARM_DESC(dma, "DMA channels"); MODULE_PARM_DESC(dma, "DMA channels");
module_param(dongle_id, int, 0); module_param(dongle_id, int, 0);
MODULE_PARM_DESC(dongle_id, "Type-id of used dongle"); MODULE_PARM_DESC(dongle_id, "Type-id of used dongle");

10
drivers/net/irda/smsc-ircc2.c
View File

@ -82,24 +82,24 @@ MODULE_PARM_DESC(nopnp, "Do not use PNP to detect controller settings, defaults
#define DMA_INVAL 255 #define DMA_INVAL 255
static int ircc_dma = DMA_INVAL; static int ircc_dma = DMA_INVAL;
module_param(ircc_dma, int, 0); module_param_hw(ircc_dma, int, dma, 0);
MODULE_PARM_DESC(ircc_dma, "DMA channel"); MODULE_PARM_DESC(ircc_dma, "DMA channel");
#define IRQ_INVAL 255 #define IRQ_INVAL 255
static int ircc_irq = IRQ_INVAL; static int ircc_irq = IRQ_INVAL;
module_param(ircc_irq, int, 0); module_param_hw(ircc_irq, int, irq, 0);
MODULE_PARM_DESC(ircc_irq, "IRQ line"); MODULE_PARM_DESC(ircc_irq, "IRQ line");
static int ircc_fir; static int ircc_fir;
module_param(ircc_fir, int, 0); module_param_hw(ircc_fir, int, ioport, 0);
MODULE_PARM_DESC(ircc_fir, "FIR Base Address"); MODULE_PARM_DESC(ircc_fir, "FIR Base Address");
static int ircc_sir; static int ircc_sir;
module_param(ircc_sir, int, 0); module_param_hw(ircc_sir, int, ioport, 0);
MODULE_PARM_DESC(ircc_sir, "SIR Base Address"); MODULE_PARM_DESC(ircc_sir, "SIR Base Address");
static int ircc_cfg; static int ircc_cfg;
module_param(ircc_cfg, int, 0); module_param_hw(ircc_cfg, int, ioport, 0);
MODULE_PARM_DESC(ircc_cfg, "Configuration register base address"); MODULE_PARM_DESC(ircc_cfg, "Configuration register base address");
static int ircc_transceiver; static int ircc_transceiver;

4
drivers/net/irda/w83977af_ir.c
View File

@ -1263,9 +1263,9 @@ MODULE_LICENSE("GPL");
module_param(qos_mtt_bits, int, 0); module_param(qos_mtt_bits, int, 0);
MODULE_PARM_DESC(qos_mtt_bits, "Mimimum Turn Time"); MODULE_PARM_DESC(qos_mtt_bits, "Mimimum Turn Time");
module_param_array(io, int, NULL, 0); module_param_hw_array(io, int, ioport, NULL, 0);
MODULE_PARM_DESC(io, "Base I/O addresses"); MODULE_PARM_DESC(io, "Base I/O addresses");
module_param_array(irq, int, NULL, 0); module_param_hw_array(irq, int, irq, NULL, 0);
MODULE_PARM_DESC(irq, "IRQ lines"); MODULE_PARM_DESC(irq, "IRQ lines");
/* /*