leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ASoC: rt7*-sdw: harden jack_detect_handler

Browse Source 
Realtek headset codec drivers typically check if the card is
instantiated before proceeding with the jack detection.

The rt700, rt711 and rt711-sdca are however missing a check on the
card pointer, which can lead to NULL dereferences encountered in
driver bind/unbind tests.

Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Reviewed-by: Rander Wang <rander.wang@intel.com>
Reviewed-by: Bard Liao <yung-chuan.liao@linux.intel.com>
Link: https://lore.kernel.org/r/20220606203752.144159-6-pierre-louis.bossart@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Pierre-Louis Bossart
2022-06-06 15:37:50 -05:00
committed by Mark Brown
parent 74d40901eb
commit 05ba4c00fa
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sound/soc/codecs/rt700.c
View File

@@ -162,7 +162,7 @@ static void rt700_jack_detect_handler(struct work_struct *work)
if (!rt700->hs_jack) if (!rt700->hs_jack)
return; return;
if (!rt700->component->card->instantiated) if (!rt700->component->card || !rt700->component->card->instantiated)
return; return;
reg = RT700_VERB_GET_PIN_SENSE | RT700_HP_OUT; reg = RT700_VERB_GET_PIN_SENSE | RT700_HP_OUT;

2
sound/soc/codecs/rt711-sdca.c
View File

@@ -294,7 +294,7 @@ static void rt711_sdca_jack_detect_handler(struct work_struct *work)
if (!rt711->hs_jack) if (!rt711->hs_jack)
return; return;
if (!rt711->component->card->instantiated) if (!rt711->component->card || !rt711->component->card->instantiated)
return; return;
/* SDW_SCP_SDCA_INT_SDCA_0 is used for jack detection */ /* SDW_SCP_SDCA_INT_SDCA_0 is used for jack detection */

2
sound/soc/codecs/rt711.c
View File

@@ -242,7 +242,7 @@ static void rt711_jack_detect_handler(struct work_struct *work)
if (!rt711->hs_jack) if (!rt711->hs_jack)
return; return;
if (!rt711->component->card->instantiated) if (!rt711->component->card || !rt711->component->card->instantiated)
return; return;
if (pm_runtime_status_suspended(rt711->slave->dev.parent)) { if (pm_runtime_status_suspended(rt711->slave->dev.parent)) {