Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e992ef57 authored by David Howells's avatar David Howells
Browse files

Annotate hardware config module parameters in sound/isa/ 



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 sound/isa/.

Suggested-by: default avatarAlan Cox <gnomes@lxorguk.ukuu.org.uk>
Signed-off-by: default avatarDavid Howells <dhowells@redhat.com>
cc: Jaroslav Kysela <perex@perex.cz>
cc: Takashi Iwai <tiwai@suse.com>
cc: alsa-devel@alsa-project.org
parent b11ce420

sound/isa/ad1848/ad1848.c

+3 −3
Original line number Diff line number Diff line
@@ -55,11 +55,11 @@ module_param_array(id, charp, NULL, 0444); 
MODULE_PARM_DESC(id, "ID string for " CRD_NAME " soundcard.");

module_param_array(enable, bool, NULL, 0444);

MODULE_PARM_DESC(enable, "Enable " CRD_NAME " soundcard.");

module_param_array(port, long, NULL, 0444);

module_param_hw_array(port, long, ioport, NULL, 0444);

MODULE_PARM_DESC(port, "Port # for " CRD_NAME " driver.");

module_param_array(irq, int, NULL, 0444);

module_param_hw_array(irq, int, irq, NULL, 0444);

MODULE_PARM_DESC(irq, "IRQ # for " CRD_NAME " driver.");

module_param_array(dma1, int, NULL, 0444);

module_param_hw_array(dma1, int, dma, NULL, 0444);

MODULE_PARM_DESC(dma1, "DMA1 # for " CRD_NAME " driver.");

module_param_array(thinkpad, bool, NULL, 0444);

MODULE_PARM_DESC(thinkpad, "Enable only for the onboard CS4248 of IBM Thinkpad 360/750/755 series.");

sound/isa/adlib.c

+1 −1
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ module_param_array(id, charp, NULL, 0444); 
MODULE_PARM_DESC(id, "ID string for " CRD_NAME " soundcard.");

module_param_array(enable, bool, NULL, 0444);

MODULE_PARM_DESC(enable, "Enable " CRD_NAME " soundcard.");

module_param_array(port, long, NULL, 0444);

module_param_hw_array(port, long, ioport, NULL, 0444);

MODULE_PARM_DESC(port, "Port # for " CRD_NAME " driver.");



static int snd_adlib_match(struct device *dev, unsigned int n)

sound/isa/cmi8328.c

+6 −6
Original line number Diff line number Diff line
@@ -51,18 +51,18 @@ MODULE_PARM_DESC(index, "Index value for CMI8328 soundcard."); 
module_param_array(id, charp, NULL, 0444);

MODULE_PARM_DESC(id, "ID string for CMI8328 soundcard.");



module_param_array(port, long, NULL, 0444);

module_param_hw_array(port, long, ioport, NULL, 0444);

MODULE_PARM_DESC(port, "Port # for CMI8328 driver.");

module_param_array(irq, int, NULL, 0444);

module_param_hw_array(irq, int, irq, NULL, 0444);

MODULE_PARM_DESC(irq, "IRQ # for CMI8328 driver.");

module_param_array(dma1, int, NULL, 0444);

module_param_hw_array(dma1, int, dma, NULL, 0444);

MODULE_PARM_DESC(dma1, "DMA1 for CMI8328 driver.");

module_param_array(dma2, int, NULL, 0444);

module_param_hw_array(dma2, int, dma, NULL, 0444);

MODULE_PARM_DESC(dma2, "DMA2 for CMI8328 driver.");



module_param_array(mpuport, long, NULL, 0444);

module_param_hw_array(mpuport, long, ioport, NULL, 0444);

MODULE_PARM_DESC(mpuport, "MPU-401 port # for CMI8328 driver.");

module_param_array(mpuirq, int, NULL, 0444);

module_param_hw_array(mpuirq, int, irq, NULL, 0444);

MODULE_PARM_DESC(mpuirq, "IRQ # for CMI8328 MPU-401 port.");

#ifdef SUPPORT_JOYSTICK

module_param_array(gameport, bool, NULL, 0444);

sound/isa/cmi8330.c

+10 −10
Original line number Diff line number Diff line
@@ -95,27 +95,27 @@ module_param_array(isapnp, bool, NULL, 0444); 
MODULE_PARM_DESC(isapnp, "PnP detection for specified soundcard.");

#endif



module_param_array(sbport, long, NULL, 0444);

module_param_hw_array(sbport, long, ioport, NULL, 0444);

MODULE_PARM_DESC(sbport, "Port # for CMI8330/CMI8329 SB driver.");

module_param_array(sbirq, int, NULL, 0444);

module_param_hw_array(sbirq, int, irq, NULL, 0444);

MODULE_PARM_DESC(sbirq, "IRQ # for CMI8330/CMI8329 SB driver.");

module_param_array(sbdma8, int, NULL, 0444);

module_param_hw_array(sbdma8, int, dma, NULL, 0444);

MODULE_PARM_DESC(sbdma8, "DMA8 for CMI8330/CMI8329 SB driver.");

module_param_array(sbdma16, int, NULL, 0444);

module_param_hw_array(sbdma16, int, dma, NULL, 0444);

MODULE_PARM_DESC(sbdma16, "DMA16 for CMI8330/CMI8329 SB driver.");



module_param_array(wssport, long, NULL, 0444);

module_param_hw_array(wssport, long, ioport, NULL, 0444);

MODULE_PARM_DESC(wssport, "Port # for CMI8330/CMI8329 WSS driver.");

module_param_array(wssirq, int, NULL, 0444);

module_param_hw_array(wssirq, int, irq, NULL, 0444);

MODULE_PARM_DESC(wssirq, "IRQ # for CMI8330/CMI8329 WSS driver.");

module_param_array(wssdma, int, NULL, 0444);

module_param_hw_array(wssdma, int, dma, NULL, 0444);

MODULE_PARM_DESC(wssdma, "DMA for CMI8330/CMI8329 WSS driver.");



module_param_array(fmport, long, NULL, 0444);

module_param_hw_array(fmport, long, ioport, NULL, 0444);

MODULE_PARM_DESC(fmport, "FM port # for CMI8330/CMI8329 driver.");

module_param_array(mpuport, long, NULL, 0444);

module_param_hw_array(mpuport, long, ioport, NULL, 0444);

MODULE_PARM_DESC(mpuport, "MPU-401 port # for CMI8330/CMI8329 driver.");

module_param_array(mpuirq, int, NULL, 0444);

module_param_hw_array(mpuirq, int, irq, NULL, 0444);

MODULE_PARM_DESC(mpuirq, "IRQ # for CMI8330/CMI8329 MPU-401 port.");

#ifdef CONFIG_PNP

static int isa_registered;

sound/isa/cs423x/cs4231.c

+6 −6
Original line number Diff line number Diff line
@@ -55,17 +55,17 @@ module_param_array(id, charp, NULL, 0444); 
MODULE_PARM_DESC(id, "ID string for " CRD_NAME " soundcard.");

module_param_array(enable, bool, NULL, 0444);

MODULE_PARM_DESC(enable, "Enable " CRD_NAME " soundcard.");

module_param_array(port, long, NULL, 0444);

module_param_hw_array(port, long, ioport, NULL, 0444);

MODULE_PARM_DESC(port, "Port # for " CRD_NAME " driver.");

module_param_array(mpu_port, long, NULL, 0444);

module_param_hw_array(mpu_port, long, ioport, NULL, 0444);

MODULE_PARM_DESC(mpu_port, "MPU-401 port # for " CRD_NAME " driver.");

module_param_array(irq, int, NULL, 0444);

module_param_hw_array(irq, int, irq, NULL, 0444);

MODULE_PARM_DESC(irq, "IRQ # for " CRD_NAME " driver.");

module_param_array(mpu_irq, int, NULL, 0444);

module_param_hw_array(mpu_irq, int, irq, NULL, 0444);

MODULE_PARM_DESC(mpu_irq, "MPU-401 IRQ # for " CRD_NAME " driver.");

module_param_array(dma1, int, NULL, 0444);

module_param_hw_array(dma1, int, dma, NULL, 0444);

MODULE_PARM_DESC(dma1, "DMA1 # for " CRD_NAME " driver.");

module_param_array(dma2, int, NULL, 0444);

module_param_hw_array(dma2, int, dma, NULL, 0444);

MODULE_PARM_DESC(dma2, "DMA2 # for " CRD_NAME " driver.");



static int snd_cs4231_match(struct device *dev, unsigned int n)