Skip to content

Commit daaf4fe

Browse files
haruki3hhhgregkh
authored andcommitted
ASoC: fsl_xcvr: fix missing lock in fsl_xcvr_mode_put()
[ Upstream commit f514248 ] fsl_xcvr_activate_ctl() has lockdep_assert_held(&card->snd_card->controls_rwsem), but fsl_xcvr_mode_put() calls it without acquiring this lock. Other callers of fsl_xcvr_activate_ctl() in fsl_xcvr_startup() and fsl_xcvr_shutdown() properly acquire the lock with down_read()/up_read(). Add the missing down_read()/up_read() calls around fsl_xcvr_activate_ctl() in fsl_xcvr_mode_put() to fix the lockdep assertion and prevent potential race conditions when multiple userspace threads access the control. Signed-off-by: Ziyi Guo <n7l8m4@u.northwestern.edu> Link: https://patch.msgid.link/20260202174112.2018402-1-n7l8m4@u.northwestern.edu Signed-off-by: Mark Brown <broonie@kernel.org> Signed-off-by: Sasha Levin <sashal@kernel.org>
1 parent 67484f3 commit daaf4fe

1 file changed

Lines changed: 3 additions & 0 deletions

File tree

sound/soc/fsl/fsl_xcvr.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -216,10 +216,13 @@ static int fsl_xcvr_mode_put(struct snd_kcontrol *kcontrol,
216216

217217
xcvr->mode = snd_soc_enum_item_to_val(e, item[0]);
218218

219+
down_read(&card->snd_card->controls_rwsem);
219220
fsl_xcvr_activate_ctl(dai, fsl_xcvr_arc_mode_kctl.name,
220221
(xcvr->mode == FSL_XCVR_MODE_ARC));
221222
fsl_xcvr_activate_ctl(dai, fsl_xcvr_earc_capds_kctl.name,
222223
(xcvr->mode == FSL_XCVR_MODE_EARC));
224+
up_read(&card->snd_card->controls_rwsem);
225+
223226
/* Allow playback for SPDIF only */
224227
rtd = snd_soc_get_pcm_runtime(card, card->dai_link);
225228
rtd->pcm->streams[SNDRV_PCM_STREAM_PLAYBACK].substream_count =

0 commit comments

Comments
 (0)