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/staging/speakup/

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

Suggested-by: Alan Cox <gnomes@lxorguk.ukuu.org.uk>
Signed-off-by: David Howells <dhowells@redhat.com>
Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
cc: speakup@linux-speakup.org
cc: devel@driverdev.osuosl.org

+3 -3
+1 -1
drivers/staging/speakup/speakup_acntpc.c
··· 307 307 speakup_info.port_tts = 0; 308 308 } 309 309 310 - module_param_named(port, port_forced, int, 0444); 310 + module_param_hw_named(port, port_forced, int, ioport, 0444); 311 311 module_param_named(start, synth_acntpc.startup, short, 0444); 312 312 313 313 MODULE_PARM_DESC(port, "Set the port for the synthesizer (override probing).");
+1 -1
drivers/staging/speakup/speakup_dtlk.c
··· 378 378 speakup_info.port_tts = 0; 379 379 } 380 380 381 - module_param_named(port, port_forced, int, 0444); 381 + module_param_hw_named(port, port_forced, int, ioport, 0444); 382 382 module_param_named(start, synth_dtlk.startup, short, 0444); 383 383 384 384 MODULE_PARM_DESC(port, "Set the port for the synthesizer (override probing).");
+1 -1
drivers/staging/speakup/speakup_keypc.c
··· 309 309 synth_port = 0; 310 310 } 311 311 312 - module_param_named(port, port_forced, int, 0444); 312 + module_param_hw_named(port, port_forced, int, ioport, 0444); 313 313 module_param_named(start, synth_keypc.startup, short, 0444); 314 314 315 315 MODULE_PARM_DESC(port, "Set the port for the synthesizer (override probing).");