53 lines
2.2 KiB
Diff
53 lines
2.2 KiB
Diff
From: David Howells <dhowells@redhat.com>
|
|
Date: Tue, 4 Apr 2017 16:54:28 +0100
|
|
Subject: [27/61] Annotate hardware config module parameters in
|
|
drivers/staging/media/
|
|
Origin: https://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git/commit?id=db33ab46d89c69211f56940278c394067fe6876e
|
|
|
|
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/staging/media/.
|
|
|
|
Suggested-by: Alan Cox <gnomes@lxorguk.ukuu.org.uk>
|
|
Signed-off-by: David Howells <dhowells@redhat.com>
|
|
cc: Mauro Carvalho Chehab <mchehab@kernel.org>
|
|
cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
|
|
cc: linux-media@vger.kernel.org
|
|
cc: devel@driverdev.osuosl.org
|
|
[bwh: For 4.12, fix up filename and permission format]
|
|
---
|
|
drivers/media/rc/sir_ir.c | 4 ++--
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
--- a/drivers/media/rc/sir_ir.c
|
|
+++ b/drivers/media/rc/sir_ir.c
|
|
@@ -434,10 +434,10 @@ MODULE_DESCRIPTION("Infrared receiver dr
|
|
MODULE_AUTHOR("Milan Pikula");
|
|
MODULE_LICENSE("GPL");
|
|
|
|
-module_param(io, int, 0444);
|
|
+module_param_hw(io, int, ioport, 0444);
|
|
MODULE_PARM_DESC(io, "I/O address base (0x3f8 or 0x2f8)");
|
|
|
|
-module_param(irq, int, 0444);
|
|
+module_param_hw(irq, int, irq, 0444);
|
|
MODULE_PARM_DESC(irq, "Interrupt (4 or 3)");
|
|
|
|
module_param(threshold, int, 0444);
|