Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

Annotate hardware config module parameters in drivers/video/

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/video/.

Suggested-by: Alan Cox <gnomes@lxorguk.ukuu.org.uk>
Signed-off-by: David Howells <dhowells@redhat.com>
Acked-by: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
cc: Tomi Valkeinen <tomi.valkeinen@ti.com>
cc: linux-fbdev@vger.kernel.org

+7 -7
+4 -4
drivers/video/fbdev/arcfb.c
··· 645 645 MODULE_PARM_DESC(nosplash, "Disable doing the splash screen"); 646 646 module_param(arcfb_enable, uint, 0); 647 647 MODULE_PARM_DESC(arcfb_enable, "Enable communication with Arc board"); 648 - module_param(dio_addr, ulong, 0); 648 + module_param_hw(dio_addr, ulong, ioport, 0); 649 649 MODULE_PARM_DESC(dio_addr, "IO address for data, eg: 0x480"); 650 - module_param(cio_addr, ulong, 0); 650 + module_param_hw(cio_addr, ulong, ioport, 0); 651 651 MODULE_PARM_DESC(cio_addr, "IO address for control, eg: 0x400"); 652 - module_param(c2io_addr, ulong, 0); 652 + module_param_hw(c2io_addr, ulong, ioport, 0); 653 653 MODULE_PARM_DESC(c2io_addr, "IO address for secondary control, eg: 0x408"); 654 654 module_param(splashval, ulong, 0); 655 655 MODULE_PARM_DESC(splashval, "Splash pattern: 0xFF is black, 0x00 is green"); 656 656 module_param(tuhold, ulong, 0); 657 657 MODULE_PARM_DESC(tuhold, "Time to hold between strobing data to Arc board"); 658 - module_param(irq, uint, 0); 658 + module_param_hw(irq, uint, irq, 0); 659 659 MODULE_PARM_DESC(irq, "IRQ for the Arc board"); 660 660 661 661 module_init(arcfb_init);
+3 -3
drivers/video/fbdev/n411.c
··· 193 193 194 194 module_param(nosplash, uint, 0); 195 195 MODULE_PARM_DESC(nosplash, "Disable doing the splash screen"); 196 - module_param(dio_addr, ulong, 0); 196 + module_param_hw(dio_addr, ulong, ioport, 0); 197 197 MODULE_PARM_DESC(dio_addr, "IO address for data, eg: 0x480"); 198 - module_param(cio_addr, ulong, 0); 198 + module_param_hw(cio_addr, ulong, ioport, 0); 199 199 MODULE_PARM_DESC(cio_addr, "IO address for control, eg: 0x400"); 200 - module_param(c2io_addr, ulong, 0); 200 + module_param_hw(c2io_addr, ulong, ioport, 0); 201 201 MODULE_PARM_DESC(c2io_addr, "IO address for secondary control, eg: 0x408"); 202 202 module_param(splashval, ulong, 0); 203 203 MODULE_PARM_DESC(splashval, "Splash pattern: 0x00 is black, 0x01 is white");