Commit 7b814a7d authored Aug 15, 2017 by Anton Vasilyev Committed by Mark Brown Aug 15, 2017

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>

parent d92dd70e

sound/soc/samsung/i2s.c

+1 −5

Original line number	Original line	Diff line number	Diff line
	@@ -1388,13 +1388,9 @@ err_disable_clk:

	static int samsung_i2s_remove(struct platform_device *pdev)		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);		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_get_sync(&pdev->dev);
	pm_runtime_disable(&pdev->dev);		pm_runtime_disable(&pdev->dev);

Admin message