Commit 3feb6de4 authored by David Howells's avatar David Howells Committed by Khalid Elmously

Annotate hardware config module parameters in drivers/i2c/

BugLink: https://bugs.launchpad.net/bugs/1884159

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
(backported from commit c78babcc)
Signed-off-by: default avatarSeth Forshee <seth.forshee@canonical.com>
Acked-by: default avatarStefan Bader <stefan.bader@canonical.com>
Acked-by: default avatarAndrea Righi <andrea.righi@canonical.com>
Signed-off-by: default avatarKhalid Elmously <khalid.elmously@canonical.com>
parent f246c773
...@@ -119,7 +119,7 @@ ...@@ -119,7 +119,7 @@
/* If force_addr is set to anything different from 0, we forcibly enable /* If force_addr is set to anything different from 0, we forcibly enable
the device at the given address. */ the device at the given address. */
static u16 force_addr; static u16 force_addr;
module_param(force_addr, ushort, 0); module_param_hw(force_addr, ushort, ioport, 0);
MODULE_PARM_DESC(force_addr, MODULE_PARM_DESC(force_addr,
"Initialize the base address of the i2c controller"); "Initialize the base address of the i2c controller");
......
...@@ -333,11 +333,11 @@ MODULE_AUTHOR("Hans Berglund <hb@spacetec.no>"); ...@@ -333,11 +333,11 @@ MODULE_AUTHOR("Hans Berglund <hb@spacetec.no>");
MODULE_DESCRIPTION("I2C-Bus adapter routines for PCF8584 ISA bus adapter"); MODULE_DESCRIPTION("I2C-Bus adapter routines for PCF8584 ISA bus adapter");
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
module_param(base, int, 0); module_param_hw(base, int, ioport_or_iomem, 0);
module_param(irq, int, 0); module_param_hw(irq, int, irq, 0);
module_param(clock, int, 0); module_param(clock, int, 0);
module_param(own, int, 0); module_param(own, int, 0);
module_param(mmapped, int, 0); module_param_hw(mmapped, int, other, 0);
module_init(i2c_pcfisa_init); module_init(i2c_pcfisa_init);
module_exit(i2c_pcfisa_exit); module_exit(i2c_pcfisa_exit);
...@@ -38,11 +38,11 @@ ...@@ -38,11 +38,11 @@
static struct platform_device *pdev; static struct platform_device *pdev;
static u16 base; static u16 base;
module_param(base, ushort, 0); module_param_hw(base, ushort, ioport, 0);
MODULE_PARM_DESC(base, "Base I/O address"); MODULE_PARM_DESC(base, "Base I/O address");
static int irq; static int irq;
module_param(irq, int, 0); module_param_hw(irq, int, irq, 0);
MODULE_PARM_DESC(irq, "IRQ (optional)"); MODULE_PARM_DESC(irq, "IRQ (optional)");
/* ----- Low-level parallel port access ----------------------------------- */ /* ----- Low-level parallel port access ----------------------------------- */
......
...@@ -207,10 +207,10 @@ MODULE_AUTHOR("Ian Campbell <icampbell@arcom.com>"); ...@@ -207,10 +207,10 @@ MODULE_AUTHOR("Ian Campbell <icampbell@arcom.com>");
MODULE_DESCRIPTION("ISA base PCA9564/PCA9665 driver"); MODULE_DESCRIPTION("ISA base PCA9564/PCA9665 driver");
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
module_param(base, ulong, 0); module_param_hw(base, ulong, ioport, 0);
MODULE_PARM_DESC(base, "I/O base address"); 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_PARM_DESC(irq, "IRQ");
module_param(clock, int, 0); module_param(clock, int, 0);
MODULE_PARM_DESC(clock, "Clock rate in hertz.\n\t\t" MODULE_PARM_DESC(clock, "Clock rate in hertz.\n\t\t"
......
...@@ -86,7 +86,7 @@ MODULE_PARM_DESC(force, "Forcibly enable the PIIX4. DANGEROUS!"); ...@@ -86,7 +86,7 @@ MODULE_PARM_DESC(force, "Forcibly enable the PIIX4. DANGEROUS!");
/* If force_addr is set to anything different from 0, we forcibly enable /* If force_addr is set to anything different from 0, we forcibly enable
the PIIX4 at the given address. VERY DANGEROUS! */ the PIIX4 at the given address. VERY DANGEROUS! */
static int force_addr; static int force_addr;
module_param (force_addr, int, 0); module_param_hw(force_addr, int, ioport, 0);
MODULE_PARM_DESC(force_addr, MODULE_PARM_DESC(force_addr,
"Forcibly enable the PIIX4 at the given address. " "Forcibly enable the PIIX4 at the given address. "
"EXTREMELY DANGEROUS!"); "EXTREMELY DANGEROUS!");
......
...@@ -119,7 +119,7 @@ static int blacklist[] = { ...@@ -119,7 +119,7 @@ static int blacklist[] = {
/* If force_addr is set to anything different from 0, we forcibly enable /* If force_addr is set to anything different from 0, we forcibly enable
the device at the given address. */ the device at the given address. */
static u16 force_addr; 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"); MODULE_PARM_DESC(force_addr, "Initialize the base address of the i2c controller");
static struct pci_driver sis5595_driver; static struct pci_driver sis5595_driver;
......
...@@ -94,7 +94,7 @@ MODULE_PARM_DESC(force, "Forcibly enable the SMBus. DANGEROUS!"); ...@@ -94,7 +94,7 @@ MODULE_PARM_DESC(force, "Forcibly enable the SMBus. DANGEROUS!");
/* If force_addr is set to anything different from 0, we forcibly enable /* If force_addr is set to anything different from 0, we forcibly enable
the VT596 at the given address. VERY DANGEROUS! */ the VT596 at the given address. VERY DANGEROUS! */
static u16 force_addr; static u16 force_addr;
module_param(force_addr, ushort, 0); module_param_hw(force_addr, ushort, ioport, 0);
MODULE_PARM_DESC(force_addr, MODULE_PARM_DESC(force_addr,
"Forcibly enable the SMBus at the given address. " "Forcibly enable the SMBus at the given address. "
"EXTREMELY DANGEROUS!"); "EXTREMELY DANGEROUS!");
......
...@@ -42,7 +42,7 @@ MODULE_LICENSE("GPL"); ...@@ -42,7 +42,7 @@ MODULE_LICENSE("GPL");
#define MAX_DEVICES 4 #define MAX_DEVICES 4
static int base[MAX_DEVICES] = { 0x820, 0x840 }; static int base[MAX_DEVICES] = { 0x820, 0x840 };
module_param_array(base, int, NULL, 0); module_param_hw_array(base, int, ioport, NULL, 0);
MODULE_PARM_DESC(base, "Base addresses for the ACCESS.bus controllers"); MODULE_PARM_DESC(base, "Base addresses for the ACCESS.bus controllers");
#define POLL_TIMEOUT (HZ/5) #define POLL_TIMEOUT (HZ/5)
......
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