112 lines
5.0 KiB
Diff
112 lines
5.0 KiB
Diff
From: David Howells <dhowells@redhat.com>
|
|
Date: Tue, 4 Apr 2017 16:54:26 +0100
|
|
Subject: [20/62] Annotate hardware config module parameters in
|
|
drivers/net/hamradio/
|
|
Origin: https://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git/commit?id=2bf23e0fa97ea5c3bad27fa6f878b6ecde838ea4
|
|
|
|
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/hamradio/.
|
|
|
|
Suggested-by: Alan Cox <gnomes@lxorguk.ukuu.org.uk>
|
|
Signed-off-by: David Howells <dhowells@redhat.com>
|
|
cc: Thomas Sailer <t.sailer@alumni.ethz.ch>
|
|
cc: Joerg Reuter <jreuter@yaina.de>
|
|
cc: linux-hams@vger.kernel.org
|
|
cc: netdev@vger.kernel.org
|
|
---
|
|
drivers/net/hamradio/baycom_epp.c | 2 +-
|
|
drivers/net/hamradio/baycom_par.c | 2 +-
|
|
drivers/net/hamradio/baycom_ser_fdx.c | 4 ++--
|
|
drivers/net/hamradio/baycom_ser_hdx.c | 4 ++--
|
|
drivers/net/hamradio/dmascc.c | 2 +-
|
|
5 files changed, 7 insertions(+), 7 deletions(-)
|
|
|
|
diff --git a/drivers/net/hamradio/baycom_epp.c b/drivers/net/hamradio/baycom_epp.c
|
|
index 594fa1407e29..1503f10122f7 100644
|
|
--- a/drivers/net/hamradio/baycom_epp.c
|
|
+++ b/drivers/net/hamradio/baycom_epp.c
|
|
@@ -1176,7 +1176,7 @@ static int iobase[NR_PORTS] = { 0x378, };
|
|
|
|
module_param_array(mode, charp, NULL, 0);
|
|
MODULE_PARM_DESC(mode, "baycom operating mode");
|
|
-module_param_array(iobase, int, NULL, 0);
|
|
+module_param_hw_array(iobase, int, ioport, NULL, 0);
|
|
MODULE_PARM_DESC(iobase, "baycom io base address");
|
|
|
|
MODULE_AUTHOR("Thomas M. Sailer, sailer@ife.ee.ethz.ch, hb9jnx@hb9w.che.eu");
|
|
diff --git a/drivers/net/hamradio/baycom_par.c b/drivers/net/hamradio/baycom_par.c
|
|
index 809dc25909d1..92b13b39f426 100644
|
|
--- a/drivers/net/hamradio/baycom_par.c
|
|
+++ b/drivers/net/hamradio/baycom_par.c
|
|
@@ -481,7 +481,7 @@ static int iobase[NR_PORTS] = { 0x378, };
|
|
|
|
module_param_array(mode, charp, NULL, 0);
|
|
MODULE_PARM_DESC(mode, "baycom operating mode; eg. par96 or picpar");
|
|
-module_param_array(iobase, int, NULL, 0);
|
|
+module_param_hw_array(iobase, int, ioport, NULL, 0);
|
|
MODULE_PARM_DESC(iobase, "baycom io base address");
|
|
|
|
MODULE_AUTHOR("Thomas M. Sailer, sailer@ife.ee.ethz.ch, hb9jnx@hb9w.che.eu");
|
|
diff --git a/drivers/net/hamradio/baycom_ser_fdx.c b/drivers/net/hamradio/baycom_ser_fdx.c
|
|
index ebc06822fd4d..d9a646acca20 100644
|
|
--- a/drivers/net/hamradio/baycom_ser_fdx.c
|
|
+++ b/drivers/net/hamradio/baycom_ser_fdx.c
|
|
@@ -614,9 +614,9 @@ static int baud[NR_PORTS] = { [0 ... NR_PORTS-1] = 1200 };
|
|
|
|
module_param_array(mode, charp, NULL, 0);
|
|
MODULE_PARM_DESC(mode, "baycom operating mode; * for software DCD");
|
|
-module_param_array(iobase, int, NULL, 0);
|
|
+module_param_hw_array(iobase, int, ioport, NULL, 0);
|
|
MODULE_PARM_DESC(iobase, "baycom io base address");
|
|
-module_param_array(irq, int, NULL, 0);
|
|
+module_param_hw_array(irq, int, irq, NULL, 0);
|
|
MODULE_PARM_DESC(irq, "baycom irq number");
|
|
module_param_array(baud, int, NULL, 0);
|
|
MODULE_PARM_DESC(baud, "baycom baud rate (300 to 4800)");
|
|
diff --git a/drivers/net/hamradio/baycom_ser_hdx.c b/drivers/net/hamradio/baycom_ser_hdx.c
|
|
index 60fcf512c208..f1c8a9ff3891 100644
|
|
--- a/drivers/net/hamradio/baycom_ser_hdx.c
|
|
+++ b/drivers/net/hamradio/baycom_ser_hdx.c
|
|
@@ -642,9 +642,9 @@ static int irq[NR_PORTS] = { 4, };
|
|
|
|
module_param_array(mode, charp, NULL, 0);
|
|
MODULE_PARM_DESC(mode, "baycom operating mode; * for software DCD");
|
|
-module_param_array(iobase, int, NULL, 0);
|
|
+module_param_hw_array(iobase, int, ioport, NULL, 0);
|
|
MODULE_PARM_DESC(iobase, "baycom io base address");
|
|
-module_param_array(irq, int, NULL, 0);
|
|
+module_param_hw_array(irq, int, irq, NULL, 0);
|
|
MODULE_PARM_DESC(irq, "baycom irq number");
|
|
|
|
MODULE_AUTHOR("Thomas M. Sailer, sailer@ife.ee.ethz.ch, hb9jnx@hb9w.che.eu");
|
|
diff --git a/drivers/net/hamradio/dmascc.c b/drivers/net/hamradio/dmascc.c
|
|
index 2479072981a1..dec6b76bc0fb 100644
|
|
--- a/drivers/net/hamradio/dmascc.c
|
|
+++ b/drivers/net/hamradio/dmascc.c
|
|
@@ -274,7 +274,7 @@ static unsigned long rand;
|
|
|
|
MODULE_AUTHOR("Klaus Kudielka");
|
|
MODULE_DESCRIPTION("Driver for high-speed SCC boards");
|
|
-module_param_array(io, int, NULL, 0);
|
|
+module_param_hw_array(io, int, ioport, NULL, 0);
|
|
MODULE_LICENSE("GPL");
|
|
|
|
static void __exit dmascc_exit(void)
|