ALSA: isa: Mark '*_registered' variables as __ro_after_init
PATCH 1/1 ALSA: isa: Mark '*_registered' variables as __ro_after_init
The '*_registered' variables are initialized only during the init phase in the '__init' functions and never changed. So, mark them as __ro_after_init to reduce the attack surface.
Signed-off-by Len Bao <[email protected]>
--- sound/isa/cmi8330.c | 4 ++-- sound/isa/cs423x/cs4236.c | 6 +++--- sound/isa/es18xx.c | 6 +++--- sound/isa/gus/interwave.c | 4 ++-- sound/isa/msnd/msnd_pinnacle.c | 4 ++-- sound/isa/opl3sa2.c | 6 +++--- sound/isa/sb/sb16.c | 4 ++-- sound/isa/sscape.c | 4 ++-- sound/isa/wavefront/wavefront.c | 4 ++-- 9 files changed, 21 insertions(+), 21 deletions(-)
sound/isa/cmi8330.c +2 -2
@@ -103,8 +103,8 @@ MODULE_PARM_DESC(mpuport, "MPU-401 port # for CMI8330/CMI8329 driver.");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; -static int pnp_registered; +static int isa_registered__ro_after_init ; +static int pnp_registered__ro_after_init ;#endif #define CMI8330_RMUX3D 16
sound/isa/cs423x/cs4236.c +3 -3
@@ -69,9 +69,9 @@ module_param_hw_array(dma2, int, dma, NULL, 0444);MODULE_PARM_DESC (dma2,"DMA2 # for " IDENT " driver." );#ifdef CONFIG_PNP -static int isa_registered; -static int pnpc_registered; -static int pnp_registered; +static int isa_registered__ro_after_init ; +static int pnpc_registered__ro_after_init ; +static int pnp_registered__ro_after_init ;#endif /* CONFIG_PNP */ struct snd_card_cs4236 {
sound/isa/es18xx.c +3 -3
@@ -1924,9 +1924,9 @@ module_param_hw_array(dma2, int, dma, NULL, 0444);MODULE_PARM_DESC (dma2,"DMA 2 # for ES18xx driver." );#ifdef CONFIG_PNP -static int isa_registered; -static int pnp_registered; -static int pnpc_registered; +static int isa_registered__ro_after_init ; +static int pnp_registered__ro_after_init ; +static int pnpc_registered__ro_after_init ;static const struct pnp_device_id snd_audiodrive_pnpbiosids[] = { { .id = "ESS1869" },
sound/isa/gus/interwave.c +2 -2
@@ -111,8 +111,8 @@ struct snd_interwave {#ifdef CONFIG_PNP -static int isa_registered; -static int pnp_registered; +static int isa_registered__ro_after_init ; +static int pnp_registered__ro_after_init ;static const struct pnp_card_device_id snd_interwave_pnpids[] = { #ifndef SNDRV_STB
sound/isa/msnd/msnd_pinnacle.c +2 -2
@@ -1199,8 +1199,8 @@ static int snd_msnd_pnp_resume(struct pnp_card_link *pcard) }#endif -static int isa_registered; -static int pnp_registered; +static int isa_registered__ro_after_init ; +static int pnp_registered__ro_after_init ;static const struct pnp_card_device_id msnd_pnpids[] = {/* Pinnacle PnP */
sound/isa/opl3sa2.c +3 -3
@@ -69,9 +69,9 @@ module_param_array(opl3sa3_ymode, int, NULL, 0444);MODULE_PARM_DESC (opl3sa3_ymode,"Speaker size selection for 3D Enhancement mode: Desktop/Large Notebook/Small Notebook/HiFi." );#ifdef CONFIG_PNP -static int isa_registered; -static int pnp_registered; -static int pnpc_registered; +static int isa_registered__ro_after_init ; +static int pnp_registered__ro_after_init ; +static int pnpc_registered__ro_after_init ;#endif /* control ports */
sound/isa/sb/sb16.c +2 -2
@@ -99,8 +99,8 @@ MODULE_PARM_DESC(seq_ports, "Number of sequencer ports for WaveTable synth.");#endif #ifdef CONFIG_PNP -static int isa_registered; -static int pnp_registered; +static int isa_registered__ro_after_init ; +static int pnp_registered__ro_after_init ;#endif struct snd_card_sb16 {
sound/isa/sscape.c +2 -2
@@ -71,8 +71,8 @@ module_param_array(joystick, bool, NULL, 0444);MODULE_PARM_DESC (joystick,"Enable gameport." );#ifdef CONFIG_PNP -static int isa_registered; -static int pnp_registered; +static int isa_registered__ro_after_init ; +static int pnp_registered__ro_after_init ;static const struct pnp_card_device_id sscape_pnpids[] = { { .id = "ENS3081", .devs = { { "ENS0000" } } }, /* Soundscape PnP */
sound/isa/wavefront/wavefront.c +2 -2
@@ -71,8 +71,8 @@ module_param_array(use_cs4232_midi, bool, NULL, 0444);MODULE_PARM_DESC (use_cs4232_midi,"Use CS4232 MPU-401 interface (inaccessibly located inside your computer)" );#ifdef CONFIG_PNP -static int isa_registered; -static int pnp_registered; +static int isa_registered__ro_after_init ; +static int pnp_registered__ro_after_init ;static const struct pnp_card_device_id snd_wavefront_pnpids[] = { /* Tropez */
Signature · 1 line
2.43.0
Takashi Iwai
AppliedQuoted 6 lines · Len Bao
The '
*_registered' variables are initialized only during the init phase in the '__init' functions and never changed. So, mark them as__ro_after_initto reduce the attack surface.Signed-off-by Len Bao <[email protected]>
Applied to for-next branch. Thanks.
Takashi