Unverified Commit 05ba4c00 authored Jun 06, 2022 by Pierre-Louis Bossart Committed by Mark Brown Jun 07, 2022

ASoC: rt7*-sdw: harden jack_detect_handler



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>

parent 74d40901

sound/soc/codecs/rt700.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -162,7 +162,7 @@ static void rt700_jack_detect_handler(struct work_struct *work)
		if (!rt700->hs_jack)
		return;

		if (!rt700->component->card->instantiated)
		if (!rt700->component->card \|\| !rt700->component->card->instantiated)
		return;

		reg = RT700_VERB_GET_PIN_SENSE \| RT700_HP_OUT;

sound/soc/codecs/rt711-sdca.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -294,7 +294,7 @@ static void rt711_sdca_jack_detect_handler(struct work_struct *work)
		if (!rt711->hs_jack)
		return;

		if (!rt711->component->card->instantiated)
		if (!rt711->component->card \|\| !rt711->component->card->instantiated)
		return;

		/* SDW_SCP_SDCA_INT_SDCA_0 is used for jack detection */

sound/soc/codecs/rt711.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -242,7 +242,7 @@ static void rt711_jack_detect_handler(struct work_struct *work)
		if (!rt711->hs_jack)
		return;

		if (!rt711->component->card->instantiated)
		if (!rt711->component->card \|\| !rt711->component->card->instantiated)
		return;

		if (pm_runtime_status_suspended(rt711->slave->dev.parent)) {