mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-23 17:30:02 +00:00
Annotate hardware config module parameters in drivers/net/wan/
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/wan/. Suggested-by: Alan Cox <gnomes@lxorguk.ukuu.org.uk> Signed-off-by: David Howells <dhowells@redhat.com> cc: "Jan \"Yenya\" Kasprzak" <kas@fi.muni.cz> cc: netdev@vger.kernel.org
This commit is contained in:
parent
4f06e65272
commit
af28a03c1b
4 changed files with 12 additions and 12 deletions
|
@ -232,11 +232,11 @@ static int irq[MAX_CARDS+1] = { -1, -1, -1, -1, -1, -1, 0, };
|
|||
static struct class *cosa_class;
|
||||
|
||||
#ifdef MODULE
|
||||
module_param_array(io, int, NULL, 0);
|
||||
module_param_hw_array(io, int, ioport, NULL, 0);
|
||||
MODULE_PARM_DESC(io, "The I/O bases of the COSA or SRP cards");
|
||||
module_param_array(irq, int, NULL, 0);
|
||||
module_param_hw_array(irq, int, irq, NULL, 0);
|
||||
MODULE_PARM_DESC(irq, "The IRQ lines of the COSA or SRP cards");
|
||||
module_param_array(dma, int, NULL, 0);
|
||||
module_param_hw_array(dma, int, dma, NULL, 0);
|
||||
MODULE_PARM_DESC(dma, "The DMA channels of the COSA or SRP cards");
|
||||
|
||||
MODULE_AUTHOR("Jan \"Yenya\" Kasprzak, <kas@fi.muni.cz>");
|
||||
|
|
|
@ -324,11 +324,11 @@ static void sv11_shutdown(struct z8530_dev *dev)
|
|||
static int io = 0x200;
|
||||
static int irq = 9;
|
||||
|
||||
module_param(io, int, 0);
|
||||
module_param_hw(io, int, ioport, 0);
|
||||
MODULE_PARM_DESC(io, "The I/O base of the Comtrol Hostess SV11 card");
|
||||
module_param(dma, int, 0);
|
||||
module_param_hw(dma, int, dma, 0);
|
||||
MODULE_PARM_DESC(dma, "Set this to 1 to use DMA1/DMA3 for TX/RX");
|
||||
module_param(irq, int, 0);
|
||||
module_param_hw(irq, int, irq, 0);
|
||||
MODULE_PARM_DESC(irq, "The interrupt line setting for the Comtrol Hostess SV11 card");
|
||||
|
||||
MODULE_AUTHOR("Alan Cox");
|
||||
|
|
|
@ -1463,8 +1463,8 @@ set_multicast_list( struct net_device *dev )
|
|||
|
||||
|
||||
#ifdef MODULE
|
||||
module_param_array(io, int, NULL, 0);
|
||||
module_param_array(irq, int, NULL, 0);
|
||||
module_param_hw_array(io, int, ioport, NULL, 0);
|
||||
module_param_hw_array(irq, int, irq, NULL, 0);
|
||||
module_param_array(baud, int, NULL, 0);
|
||||
module_param_array(rxl, int, NULL, 0);
|
||||
module_param_array(mac, int, NULL, 0);
|
||||
|
|
|
@ -363,13 +363,13 @@ static int rxdma=3;
|
|||
static int irq=5;
|
||||
static bool slow=false;
|
||||
|
||||
module_param(io, int, 0);
|
||||
module_param_hw(io, int, ioport, 0);
|
||||
MODULE_PARM_DESC(io, "The I/O base of the Sealevel card");
|
||||
module_param(txdma, int, 0);
|
||||
module_param_hw(txdma, int, dma, 0);
|
||||
MODULE_PARM_DESC(txdma, "Transmit DMA channel");
|
||||
module_param(rxdma, int, 0);
|
||||
module_param_hw(rxdma, int, dma, 0);
|
||||
MODULE_PARM_DESC(rxdma, "Receive DMA channel");
|
||||
module_param(irq, int, 0);
|
||||
module_param_hw(irq, int, irq, 0);
|
||||
MODULE_PARM_DESC(irq, "The interrupt line setting for the SeaLevel card");
|
||||
module_param(slow, bool, 0);
|
||||
MODULE_PARM_DESC(slow, "Set this for an older Sealevel card such as the 4012");
|
||||
|
|
Loading…
Reference in a new issue