76 lines
3.2 KiB
Diff
76 lines
3.2 KiB
Diff
From: David Howells <dhowells@redhat.com>
|
|
Date: Tue, 4 Apr 2017 16:54:27 +0100
|
|
Subject: [26/62] Annotate hardware config module parameters in drivers/pcmcia/
|
|
Origin: https://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git/commit?id=abc3baae64c4956fd6d5b1b2b0d78cdc75fb8765
|
|
|
|
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/pcmcia/.
|
|
|
|
Suggested-by: Alan Cox <gnomes@lxorguk.ukuu.org.uk>
|
|
Signed-off-by: David Howells <dhowells@redhat.com>
|
|
cc: linux-pcmcia@lists.infradead.org
|
|
---
|
|
drivers/pcmcia/i82365.c | 8 ++++----
|
|
drivers/pcmcia/tcic.c | 8 ++++----
|
|
2 files changed, 8 insertions(+), 8 deletions(-)
|
|
|
|
diff --git a/drivers/pcmcia/i82365.c b/drivers/pcmcia/i82365.c
|
|
index eb0d80a429e4..fb38cc01859f 100644
|
|
--- a/drivers/pcmcia/i82365.c
|
|
+++ b/drivers/pcmcia/i82365.c
|
|
@@ -108,12 +108,12 @@ static int async_clock = -1;
|
|
static int cable_mode = -1;
|
|
static int wakeup = 0;
|
|
|
|
-module_param(i365_base, ulong, 0444);
|
|
+module_param_hw(i365_base, ulong, ioport, 0444);
|
|
module_param(ignore, int, 0444);
|
|
module_param(extra_sockets, int, 0444);
|
|
-module_param(irq_mask, int, 0444);
|
|
-module_param_array(irq_list, int, &irq_list_count, 0444);
|
|
-module_param(cs_irq, int, 0444);
|
|
+module_param_hw(irq_mask, int, other, 0444);
|
|
+module_param_hw_array(irq_list, int, irq, &irq_list_count, 0444);
|
|
+module_param_hw(cs_irq, int, irq, 0444);
|
|
module_param(async_clock, int, 0444);
|
|
module_param(cable_mode, int, 0444);
|
|
module_param(wakeup, int, 0444);
|
|
diff --git a/drivers/pcmcia/tcic.c b/drivers/pcmcia/tcic.c
|
|
index 1ee63e5f0550..a1ac72d51d70 100644
|
|
--- a/drivers/pcmcia/tcic.c
|
|
+++ b/drivers/pcmcia/tcic.c
|
|
@@ -85,12 +85,12 @@ static int poll_quick = HZ/20;
|
|
/* CCLK external clock time, in nanoseconds. 70 ns = 14.31818 MHz */
|
|
static int cycle_time = 70;
|
|
|
|
-module_param(tcic_base, ulong, 0444);
|
|
+module_param_hw(tcic_base, ulong, ioport, 0444);
|
|
module_param(ignore, int, 0444);
|
|
module_param(do_scan, int, 0444);
|
|
-module_param(irq_mask, int, 0444);
|
|
-module_param_array(irq_list, int, &irq_list_count, 0444);
|
|
-module_param(cs_irq, int, 0444);
|
|
+module_param_hw(irq_mask, int, other, 0444);
|
|
+module_param_hw_array(irq_list, int, irq, &irq_list_count, 0444);
|
|
+module_param_hw(cs_irq, int, irq, 0444);
|
|
module_param(poll_interval, int, 0444);
|
|
module_param(poll_quick, int, 0444);
|
|
module_param(cycle_time, int, 0444);
|