Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c78babcc authored by David Howells's avatar David Howells
Browse files

Annotate hardware config module parameters in drivers/i2c/ 



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

Suggested-by: default avatarAlan Cox <gnomes@lxorguk.ukuu.org.uk>
Signed-off-by: default avatarDavid Howells <dhowells@redhat.com>
Acked-by: default avatarWolfram Sang <wsa@the-dreams.de>
Acked-by: default avatarJean Delvare <jdelvare@suse.de>
cc: linux-i2c@vger.kernel.org
parent d759f906

drivers/i2c/busses/i2c-ali15x3.c

+1 −1
Original line number Diff line number Diff line
@@ -119,7 +119,7 @@ 
/* If force_addr is set to anything different from 0, we forcibly enable

   the device at the given address. */

static u16 force_addr;

module_param(force_addr, ushort, 0);

module_param_hw(force_addr, ushort, ioport, 0);

MODULE_PARM_DESC(force_addr,

		 "Initialize the base address of the i2c controller");

drivers/i2c/busses/i2c-elektor.c

+3 −3
Original line number Diff line number Diff line
@@ -323,9 +323,9 @@ MODULE_AUTHOR("Hans Berglund <hb@spacetec.no>"); 
MODULE_DESCRIPTION("I2C-Bus adapter routines for PCF8584 ISA bus adapter");

MODULE_LICENSE("GPL");



module_param(base, int, 0);

module_param(irq, int, 0);

module_param_hw(base, int, ioport_or_iomem, 0);

module_param_hw(irq, int, irq, 0);

module_param(clock, int, 0);

module_param(own, int, 0);

module_param(mmapped, int, 0);

module_param_hw(mmapped, int, other, 0);

module_isa_driver(i2c_elektor_driver, 1);

drivers/i2c/busses/i2c-parport-light.c

+2 −2
Original line number Diff line number Diff line
@@ -38,11 +38,11 @@ 
static struct platform_device *pdev;



static u16 base;

module_param(base, ushort, 0);

module_param_hw(base, ushort, ioport, 0);

MODULE_PARM_DESC(base, "Base I/O address");



static int irq;

module_param(irq, int, 0);

module_param_hw(irq, int, irq, 0);

MODULE_PARM_DESC(irq, "IRQ (optional)");



/* ----- Low-level parallel port access ----------------------------------- */

drivers/i2c/busses/i2c-pca-isa.c

+2 −2
Original line number Diff line number Diff line
@@ -197,9 +197,9 @@ MODULE_AUTHOR("Ian Campbell <icampbell@arcom.com>"); 
MODULE_DESCRIPTION("ISA base PCA9564/PCA9665 driver");

MODULE_LICENSE("GPL");



module_param(base, ulong, 0);

module_param_hw(base, ulong, ioport, 0);

MODULE_PARM_DESC(base, "I/O base address");

module_param(irq, int, 0);

module_param_hw(irq, int, irq, 0);

MODULE_PARM_DESC(irq, "IRQ");

module_param(clock, int, 0);

MODULE_PARM_DESC(clock, "Clock rate in hertz.\n\t\t"

drivers/i2c/busses/i2c-piix4.c

+1 −1
Original line number Diff line number Diff line
@@ -106,7 +106,7 @@ MODULE_PARM_DESC(force, "Forcibly enable the PIIX4. DANGEROUS!"); 
/* If force_addr is set to anything different from 0, we forcibly enable

   the PIIX4 at the given address. VERY DANGEROUS! */

static int force_addr;

module_param (force_addr, int, 0);

module_param_hw(force_addr, int, ioport, 0);

MODULE_PARM_DESC(force_addr,

		 "Forcibly enable the PIIX4 at the given address. "

		 "EXTREMELY DANGEROUS!");