Commit 88f06b76 authored by David Howells's avatar David Howells

Annotate hardware config module parameters in drivers/scsi/

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/scsi/.
Suggested-by: default avatarAlan Cox <gnomes@lxorguk.ukuu.org.uk>
Signed-off-by: default avatarDavid Howells <dhowells@redhat.com>
cc: "Juergen E. Fischer" <fischer@norbit.de>
cc: "James E.J. Bottomley" <jejb@linux.vnet.ibm.com>
cc: "Martin K. Petersen" <martin.petersen@oracle.com>
cc: Dario Ballabio <ballabio_dario@emc.com>
cc: Finn Thain <fthain@telegraphics.com.au>
cc: Michael Schmitz <schmitzmic@gmail.com>
cc: Achim Leubner <achim_leubner@adaptec.com>
cc: linux-scsi@vger.kernel.org
parent 9149ba1f
...@@ -331,11 +331,11 @@ MODULE_LICENSE("GPL"); ...@@ -331,11 +331,11 @@ MODULE_LICENSE("GPL");
#if !defined(PCMCIA) #if !defined(PCMCIA)
#if defined(MODULE) #if defined(MODULE)
static int io[] = {0, 0}; static int io[] = {0, 0};
module_param_array(io, int, NULL, 0); module_param_hw_array(io, int, ioport, NULL, 0);
MODULE_PARM_DESC(io,"base io address of controller"); MODULE_PARM_DESC(io,"base io address of controller");
static int irq[] = {0, 0}; static int irq[] = {0, 0};
module_param_array(irq, int, NULL, 0); module_param_hw_array(irq, int, irq, NULL, 0);
MODULE_PARM_DESC(irq,"interrupt for controller"); MODULE_PARM_DESC(irq,"interrupt for controller");
static int scsiid[] = {7, 7}; static int scsiid[] = {7, 7};
......
...@@ -31,7 +31,7 @@ module_param(isapnp, bool, 0); ...@@ -31,7 +31,7 @@ module_param(isapnp, bool, 0);
MODULE_PARM_DESC(isapnp, "enable PnP support (default=1)"); MODULE_PARM_DESC(isapnp, "enable PnP support (default=1)");
static int io[MAXBOARDS] = { 0x330, 0x334, 0, 0 }; static int io[MAXBOARDS] = { 0x330, 0x334, 0, 0 };
module_param_array(io, int, NULL, 0); module_param_hw_array(io, int, ioport, NULL, 0);
MODULE_PARM_DESC(io, "base IO address of controller (0x130,0x134,0x230,0x234,0x330,0x334, default=0x330,0x334)"); MODULE_PARM_DESC(io, "base IO address of controller (0x130,0x134,0x230,0x234,0x330,0x334, default=0x330,0x334)");
/* time AHA spends on the AT-bus during data transfer */ /* time AHA spends on the AT-bus during data transfer */
......
...@@ -85,8 +85,8 @@ static int ncr_53c400; ...@@ -85,8 +85,8 @@ static int ncr_53c400;
static int ncr_53c400a; static int ncr_53c400a;
static int dtc_3181e; static int dtc_3181e;
static int hp_c2502; static int hp_c2502;
module_param(ncr_irq, int, 0); module_param_hw(ncr_irq, int, irq, 0);
module_param(ncr_addr, int, 0); module_param_hw(ncr_addr, int, ioport, 0);
module_param(ncr_5380, int, 0); module_param(ncr_5380, int, 0);
module_param(ncr_53c400, int, 0); module_param(ncr_53c400, int, 0);
module_param(ncr_53c400a, int, 0); module_param(ncr_53c400a, int, 0);
...@@ -94,11 +94,11 @@ module_param(dtc_3181e, int, 0); ...@@ -94,11 +94,11 @@ module_param(dtc_3181e, int, 0);
module_param(hp_c2502, int, 0); module_param(hp_c2502, int, 0);
static int irq[] = { -1, -1, -1, -1, -1, -1, -1, -1 }; static int irq[] = { -1, -1, -1, -1, -1, -1, -1, -1 };
module_param_array(irq, int, NULL, 0); module_param_hw_array(irq, int, irq, NULL, 0);
MODULE_PARM_DESC(irq, "IRQ number(s) (0=none, 254=auto [default])"); MODULE_PARM_DESC(irq, "IRQ number(s) (0=none, 254=auto [default])");
static int base[] = { 0, 0, 0, 0, 0, 0, 0, 0 }; static int base[] = { 0, 0, 0, 0, 0, 0, 0, 0 };
module_param_array(base, int, NULL, 0); module_param_hw_array(base, int, ioport, NULL, 0);
MODULE_PARM_DESC(base, "base address(es)"); MODULE_PARM_DESC(base, "base address(es)");
static int card[] = { -1, -1, -1, -1, -1, -1, -1, -1 }; static int card[] = { -1, -1, -1, -1, -1, -1, -1, -1 };
......
...@@ -353,7 +353,7 @@ static int probe_eisa_isa = 0; ...@@ -353,7 +353,7 @@ static int probe_eisa_isa = 0;
static int force_dma32 = 0; static int force_dma32 = 0;
/* parameters for modprobe/insmod */ /* parameters for modprobe/insmod */
module_param_array(irq, int, NULL, 0); module_param_hw_array(irq, int, irq, NULL, 0);
module_param(disable, int, 0); module_param(disable, int, 0);
module_param(reserve_mode, int, 0); module_param(reserve_mode, int, 0);
module_param_array(reserve_list, int, NULL, 0); module_param_array(reserve_list, int, NULL, 0);
......
...@@ -137,8 +137,8 @@ static struct Scsi_Host *__qlogicfas_detect(struct scsi_host_template *host, ...@@ -137,8 +137,8 @@ static struct Scsi_Host *__qlogicfas_detect(struct scsi_host_template *host,
static struct qlogicfas408_priv *cards; static struct qlogicfas408_priv *cards;
static int iobase[MAX_QLOGICFAS]; static int iobase[MAX_QLOGICFAS];
static int irq[MAX_QLOGICFAS] = { [0 ... MAX_QLOGICFAS-1] = -1 }; static int irq[MAX_QLOGICFAS] = { [0 ... MAX_QLOGICFAS-1] = -1 };
module_param_array(iobase, int, NULL, 0); module_param_hw_array(iobase, int, ioport, NULL, 0);
module_param_array(irq, int, NULL, 0); module_param_hw_array(irq, int, irq, NULL, 0);
MODULE_PARM_DESC(iobase, "I/O address"); MODULE_PARM_DESC(iobase, "I/O address");
MODULE_PARM_DESC(irq, "IRQ"); MODULE_PARM_DESC(irq, "IRQ");
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment