diff options
| author | Anton Vasilyev <vasilyev@ispras.ru> | 2017-08-15 15:19:54 +0300 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2017-08-15 18:48:55 +0100 |
| commit | 7b814a7d4e83b0917efef9dd11a8c095371f987c (patch) | |
| tree | 8116e573b8b3967c468bf20a08fdeeba684ae392 /sound | |
| parent | d92dd70e9a47cce7d51bda584e7910efd0c4ba20 (diff) | |
| download | linux-stable-7b814a7d4e83b0917efef9dd11a8c095371f987c.tar.gz linux-stable-7b814a7d4e83b0917efef9dd11a8c095371f987c.tar.bz2 linux-stable-7b814a7d4e83b0917efef9dd11a8c095371f987c.zip | |
ASoC: samsung: i2s: Null pointer dereference on samsung_i2s_remove
If (quirks & QUIRK_SEC_DAI == 0) then samsung_i2s_probe() doesn't allocate
sec_dai and pri_dai->sec_dai remains Null, but samsung_i2s_remove()
performs pri_dai->sec_dai dereference in any case.
The patch removes useless reinitialization of sec_dai at
samsung_i2s_remove(), because resources are under devm control.
Found by Linux Driver Verification project (linuxtesting.org).
Signed-off-by: Anton Vasilyev <vasilyev@ispras.ru>
Acked-by: Krzysztof Kozlowski <krzk@kernel.org>
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/samsung/i2s.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/sound/soc/samsung/i2s.c b/sound/soc/samsung/i2s.c index daf7b892c967..10a4da06c0a1 100644 --- a/sound/soc/samsung/i2s.c +++ b/sound/soc/samsung/i2s.c @@ -1388,13 +1388,9 @@ err_disable_clk: static int samsung_i2s_remove(struct platform_device *pdev) { - struct i2s_dai *pri_dai, *sec_dai; + struct i2s_dai *pri_dai; pri_dai = dev_get_drvdata(&pdev->dev); - sec_dai = pri_dai->sec_dai; - - pri_dai->sec_dai = NULL; - sec_dai->pri_dai = NULL; pm_runtime_get_sync(&pdev->dev); pm_runtime_disable(&pdev->dev); |