Skip to contentSkip to conversation

ASoC: Jack: Fix NULL pointer dereference in snd_soc_jack_report

PATCH In review Pawel Harlozinski 2 participants 6 messages Nov 12, 2019 – Nov 13, 2019

Subsystems (4)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 ASoC: Jack: Fix NULL pointer dereference in snd_soc_jack_report

Check for existance of jack before tracing.
NULL pointer dereference has been reported by KASAN while unloading machine driver (snd_soc_cnl_rt274).

---
 sound/soc/soc-jack.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
sound/soc/soc-jack.c +1 -2
index a71d2340eb05..b5748dcd490f 100644
@@ -82,10 +82,9 @@ void snd_soc_jack_report(struct snd_soc_jack *jack, int status, int mask)
 	unsigned int sync = 0;
 	int enable;
 
-	trace_snd_soc_jack_report(jack, mask, status);
-
 	if (!jack)
 		return;
+	trace_snd_soc_jack_report(jack, mask, status);
 
 	dapm = &jack->card->dapm;
 
Signature · 6 lines
2.17.1

_______________________________________________
Alsa-devel mailing list
[email protected]
https://mailman.alsa-project.org/mailman/listinfo/alsa-devel
#1 lore raw

PATCH 1/1 ASoC: rt274: Disable jack report IRQ with disabling jack

When machine driver is unloaded there is nothing to handle jack detect reports. This were causing flood of messages from unhandled IRQs.

---
 sound/soc/codecs/rt274.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
sound/soc/codecs/rt274.c +4 -2
index cbb5e176d11a..993fd365524a 100644
@@ -408,13 +408,13 @@ static int rt274_mic_detect(struct snd_soc_component *component,
 		/* Disable jack detection */
 		regmap_update_bits(rt274->regmap, RT274_EAPD_GPIO_IRQ_CTRL,
 					RT274_IRQ_EN, RT274_IRQ_DIS);
-
+		disable_irq(rt274->i2c->irq);
 		return 0;
 	}
 
 	regmap_update_bits(rt274->regmap, RT274_EAPD_GPIO_IRQ_CTRL,
 				RT274_IRQ_EN, RT274_IRQ_EN);
-
+	enable_irq(rt274->i2c->irq);
 	/* Send an initial report */
 	rt274_irq(0, rt274);
 
@@ -1197,6 +1197,8 @@ static int rt274_i2c_probe(struct i2c_client *i2c,
 				"Failed to reguest IRQ: %d\n", ret);
 			return ret;
 		}
+		/* Gets re-enabled by .set_jack = rt274_mic_detect  */
+		disable_irq(rt274->i2c->irq);
 	}
 
 	ret = devm_snd_soc_register_component(&i2c->dev,
Signature · 6 lines
2.17.1

_______________________________________________
Alsa-devel mailing list
[email protected]
https://mailman.alsa-project.org/mailman/listinfo/alsa-devel
maintainer
#2 lore raw

Re: [alsa-devel] [PATCH] ASoC: rt274: Disable jack report IRQ with disabling jack

sound/soc/codecs/rt274.c static int rt274_mic_detect(struct snd_soc_component *component, · line 412

Quoted 6 lines · Pawel Harlozinski
sound/soc/codecs/rt274.c +1 -1
 		/* Disable jack detection */
 		regmap_update_bits(rt274->regmap, RT274_EAPD_GPIO_IRQ_CTRL,
 					RT274_IRQ_EN, RT274_IRQ_DIS);
-
+		disable_irq(rt274->i2c->irq);
 		return 0;

Shouldn't the register update above be suppressing interrupts? disable_irq() is a bit of a hammer and interferes with things like possible share use.

_______________________________________________
Alsa-devel mailing list
[email protected]
https://mailman.alsa-project.org/mailman/listinfo/alsa-devel

#3 lore raw

Re: [alsa-devel] [PATCH] ASoC: rt274: Disable jack report IRQ with disabling jack

Quoted 9 lines · Mark Brown

sound/soc/codecs/rt274.c static int rt274_mic_detect(struct snd_soc_component *component, · line 412

Quoted 6 lines · Pawel Harlozinski

/* Disable jack detection */ regmap_update_bits(rt274->regmap, RT274_EAPD_GPIO_IRQ_CTRL,
RT274_IRQ_EN, RT274_IRQ_DIS);

sound/soc/codecs/rt274.c +1 -1
-
+		disable_irq(rt274->i2c->irq);
  		return 0;

Shouldn't the register update above be suppressing interrupts?

For rt274 disable_irq is also needed, otherwise we're getting flood of irq's in case of not loaded machine board.

Quoted 2 lines

disable_irq() is a bit of a hammer and interferes with things like possible share use.

This irq should be handled in codec code anyway - control of jack detect events from non-codec code is done with set_jack. Similar solutions for jack report irq enable/disable flow are implemented in rt5640 and rt5651.

Quoted 4 lines

_______________________________________________
Alsa-devel mailing list
[email protected]
https://mailman.alsa-project.org/mailman/listinfo/alsa-devel

_______________________________________________
Alsa-devel mailing list
[email protected]
https://mailman.alsa-project.org/mailman/listinfo/alsa-devel

maintainer
#4 lore raw

Re: [alsa-devel] [PATCH] ASoC: rt274: Disable jack report IRQ with disabling jack

Quoted 11 lines · Pawel
Quoted 10 lines · Mark Brown

sound/soc/codecs/rt274.c static int rt274_mic_detect(struct snd_soc_component *component, · line 412

Quoted 6 lines · Pawel Harlozinski

/* Disable jack detection */ regmap_update_bits(rt274->regmap, RT274_EAPD_GPIO_IRQ_CTRL,
RT274_IRQ_EN, RT274_IRQ_DIS);

sound/soc/codecs/rt274.c +1 -1
-
+		disable_irq(rt274->i2c->irq);
  		return 0;

Shouldn't the register update above be suppressing interrupts?

Quoted 2 lines

For rt274 disable_irq is also needed, otherwise we're getting flood of irq's in case of not loaded machine board.

Through what mechanism is it needed? If your machine driver is having an impact on this I'm rather worried.

Quoted 5 lines
Quoted 2 lines

disable_irq() is a bit of a hammer and interferes with things like possible share use.

This irq should be handled in codec code anyway - control of jack detect events from non-codec code is done with set_jack.

The issue isn't that this is in CODEC code, the issue is that it's usually very worrying to need to explicitly disable and enable an interrupt at the controller level when the device appears to have controls that should stop it asserting the interrupt when it's not wanted.

Quoted 2 lines

Similar solutions for jack report irq enable/disable flow are implemented in rt5640 and rt5651.

This may be an indication that those drivers should be improved rather than that they should be copied.

_______________________________________________
Alsa-devel mailing list
[email protected]
https://mailman.alsa-project.org/mailman/listinfo/alsa-devel

maintainer
#5 lore raw

[alsa-devel] Applied "ASoC: Jack: Fix NULL pointer dereference in snd_soc_jack_report" to the asoc tree

In reply to Pawel Harlozinski

The patch

ASoC: Jack: Fix NULL pointer dereference in snd_soc_jack_report

has been applied to the asoc tree at

https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-5.4

All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted.

You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed.

If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced.

Please add any relevant lists and maintainers to the CCs when replying to this mail.

Thanks,
Mark

From 8f157d4ff039e03e2ed4cb602eeed2fd4687a58f Mon Sep 17 00:00:00 2001
From: Pawel Harlozinski <[email protected]>
Date: Tue, 12 Nov 2019 14:02:36 +0100
Subject: [PATCH] ASoC: Jack: Fix NULL pointer dereference in
snd_soc_jack_report

Check for existance of jack before tracing.
NULL pointer dereference has been reported by KASAN while unloading machine driver (snd_soc_cnl_rt274).

---
 sound/soc/soc-jack.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
sound/soc/soc-jack.c +1 -2
index a71d2340eb05..b5748dcd490f 100644
@@ -82,10 +82,9 @@ void snd_soc_jack_report(struct snd_soc_jack *jack, int status, int mask)
 	unsigned int sync = 0;
 	int enable;
 
-	trace_snd_soc_jack_report(jack, mask, status);
-
 	if (!jack)
 		return;
+	trace_snd_soc_jack_report(jack, mask, status);
 
 	dapm = &jack->card->dapm;
 
Signature · 1 line
2.20.1