88 lines
3.9 KiB
Diff
88 lines
3.9 KiB
Diff
From: David Howells <dhowells@redhat.com>
|
|
Date: Tue, 4 Apr 2017 16:54:25 +0100
|
|
Subject: [18/62] Annotate hardware config module parameters in
|
|
drivers/net/can/
|
|
Origin: https://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git/commit?id=062a92aff0917dc6c418648979564e1632924f2e
|
|
|
|
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/can/.
|
|
|
|
Suggested-by: Alan Cox <gnomes@lxorguk.ukuu.org.uk>
|
|
Signed-off-by: David Howells <dhowells@redhat.com>
|
|
Acked-by: Marc Kleine-Budde <mkl@pengutronix.de>
|
|
cc: Wolfgang Grandegger <wg@grandegger.com>
|
|
cc: linux-can@vger.kernel.org
|
|
cc: netdev@vger.kernel.org
|
|
---
|
|
drivers/net/can/cc770/cc770_isa.c | 8 ++++----
|
|
drivers/net/can/sja1000/sja1000_isa.c | 8 ++++----
|
|
2 files changed, 8 insertions(+), 8 deletions(-)
|
|
|
|
diff --git a/drivers/net/can/cc770/cc770_isa.c b/drivers/net/can/cc770/cc770_isa.c
|
|
index e0d15711e9ac..3a30fd3b4498 100644
|
|
--- a/drivers/net/can/cc770/cc770_isa.c
|
|
+++ b/drivers/net/can/cc770/cc770_isa.c
|
|
@@ -82,16 +82,16 @@ static u8 cor[MAXDEV] = {[0 ... (MAXDEV - 1)] = 0xff};
|
|
static u8 bcr[MAXDEV] = {[0 ... (MAXDEV - 1)] = 0xff};
|
|
static int indirect[MAXDEV] = {[0 ... (MAXDEV - 1)] = -1};
|
|
|
|
-module_param_array(port, ulong, NULL, S_IRUGO);
|
|
+module_param_hw_array(port, ulong, ioport, NULL, S_IRUGO);
|
|
MODULE_PARM_DESC(port, "I/O port number");
|
|
|
|
-module_param_array(mem, ulong, NULL, S_IRUGO);
|
|
+module_param_hw_array(mem, ulong, iomem, NULL, S_IRUGO);
|
|
MODULE_PARM_DESC(mem, "I/O memory address");
|
|
|
|
-module_param_array(indirect, int, NULL, S_IRUGO);
|
|
+module_param_hw_array(indirect, int, ioport, NULL, S_IRUGO);
|
|
MODULE_PARM_DESC(indirect, "Indirect access via address and data port");
|
|
|
|
-module_param_array(irq, int, NULL, S_IRUGO);
|
|
+module_param_hw_array(irq, int, irq, NULL, S_IRUGO);
|
|
MODULE_PARM_DESC(irq, "IRQ number");
|
|
|
|
module_param_array(clk, int, NULL, S_IRUGO);
|
|
diff --git a/drivers/net/can/sja1000/sja1000_isa.c b/drivers/net/can/sja1000/sja1000_isa.c
|
|
index e97e6d35b300..a89c1e92554d 100644
|
|
--- a/drivers/net/can/sja1000/sja1000_isa.c
|
|
+++ b/drivers/net/can/sja1000/sja1000_isa.c
|
|
@@ -48,16 +48,16 @@ static unsigned char ocr[MAXDEV] = {[0 ... (MAXDEV - 1)] = 0xff};
|
|
static int indirect[MAXDEV] = {[0 ... (MAXDEV - 1)] = -1};
|
|
static spinlock_t indirect_lock[MAXDEV]; /* lock for indirect access mode */
|
|
|
|
-module_param_array(port, ulong, NULL, S_IRUGO);
|
|
+module_param_hw_array(port, ulong, ioport, NULL, S_IRUGO);
|
|
MODULE_PARM_DESC(port, "I/O port number");
|
|
|
|
-module_param_array(mem, ulong, NULL, S_IRUGO);
|
|
+module_param_hw_array(mem, ulong, iomem, NULL, S_IRUGO);
|
|
MODULE_PARM_DESC(mem, "I/O memory address");
|
|
|
|
-module_param_array(indirect, int, NULL, S_IRUGO);
|
|
+module_param_hw_array(indirect, int, ioport, NULL, S_IRUGO);
|
|
MODULE_PARM_DESC(indirect, "Indirect access via address and data port");
|
|
|
|
-module_param_array(irq, int, NULL, S_IRUGO);
|
|
+module_param_hw_array(irq, int, irq, NULL, S_IRUGO);
|
|
MODULE_PARM_DESC(irq, "IRQ number");
|
|
|
|
module_param_array(clk, int, NULL, S_IRUGO);
|