Commit 6192c41f authored by David Howells's avatar David Howells
Browse files

Annotate hardware config module parameters in sound/pci/ 



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

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 232b0b08

sound/pci/als4000.c

+1 −1
Original line number Diff line number Diff line
@@ -102,7 +102,7 @@ MODULE_PARM_DESC(id, "ID string for ALS4000 soundcard."); 
module_param_array(enable, bool, NULL, 0444);

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

#ifdef SUPPORT_JOYSTICK

module_param_array(joystick_port, int, NULL, 0444);

module_param_hw_array(joystick_port, int, ioport, NULL, 0444);

MODULE_PARM_DESC(joystick_port, "Joystick port address for ALS4000 soundcard. (0 = disabled)");

#endif

sound/pci/cmipci.c

+3 −3
Original line number Diff line number Diff line
@@ -68,14 +68,14 @@ module_param_array(id, charp, NULL, 0444); 
MODULE_PARM_DESC(id, "ID string for C-Media PCI soundcard.");

module_param_array(enable, bool, NULL, 0444);

MODULE_PARM_DESC(enable, "Enable C-Media PCI soundcard.");

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.");

module_param_array(fm_port, long, NULL, 0444);

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

MODULE_PARM_DESC(fm_port, "FM port.");

module_param_array(soft_ac3, bool, NULL, 0444);

MODULE_PARM_DESC(soft_ac3, "Software-conversion of raw SPDIF packets (model 033 only).");

#ifdef SUPPORT_JOYSTICK

module_param_array(joystick_port, int, NULL, 0444);

module_param_hw_array(joystick_port, int, ioport, NULL, 0444);

MODULE_PARM_DESC(joystick_port, "Joystick port address.");

#endif

sound/pci/ens1370.c

+1 −1
Original line number Diff line number Diff line
@@ -106,7 +106,7 @@ module_param_array(enable, bool, NULL, 0444); 
MODULE_PARM_DESC(enable, "Enable Ensoniq AudioPCI soundcard.");

#ifdef SUPPORT_JOYSTICK

#ifdef CHIP1371

module_param_array(joystick_port, int, NULL, 0444);

module_param_hw_array(joystick_port, int, ioport, NULL, 0444);

MODULE_PARM_DESC(joystick_port, "Joystick port address.");

#else

module_param_array(joystick, bool, NULL, 0444);

sound/pci/riptide/riptide.c

+3 −3
Original line number Diff line number Diff line
@@ -137,12 +137,12 @@ MODULE_PARM_DESC(id, "ID string for Riptide soundcard."); 
module_param_array(enable, bool, NULL, 0444);

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

#ifdef SUPPORT_JOYSTICK

module_param_array(joystick_port, int, NULL, 0444);

module_param_hw_array(joystick_port, int, ioport, NULL, 0444);

MODULE_PARM_DESC(joystick_port, "Joystick port # for Riptide soundcard.");

#endif

module_param_array(mpu_port, int, NULL, 0444);

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

MODULE_PARM_DESC(mpu_port, "MPU401 port # for Riptide driver.");

module_param_array(opl3_port, int, NULL, 0444);

module_param_hw_array(opl3_port, int, ioport, NULL, 0444);

MODULE_PARM_DESC(opl3_port, "OPL3 port # for Riptide driver.");



/*

sound/pci/sonicvibes.c

+1 −1
Original line number Diff line number Diff line
@@ -66,7 +66,7 @@ module_param_array(reverb, bool, NULL, 0444); 
MODULE_PARM_DESC(reverb, "Enable reverb (SRAM is present) for S3 SonicVibes soundcard.");

module_param_array(mge, bool, NULL, 0444);

MODULE_PARM_DESC(mge, "MIC Gain Enable for S3 SonicVibes soundcard.");

module_param(dmaio, uint, 0444);

module_param_hw(dmaio, uint, ioport, 0444);

MODULE_PARM_DESC(dmaio, "DDMA i/o base address for S3 SonicVibes soundcard.");



/*

CRA Git | Maintained and supported by SUSTech CRA and CCSE