Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Unverified Commit 43217236 authored by Alexey Khoroshilov's avatar Alexey Khoroshilov Committed by Mark Brown
Browse files

ASoC: tegra_alc5632: fix device_node refcounting 



tegra_alc5632_probe() increments reference count of device nodes
with of_parse_phandle(), but there is no code decrementing them
in the driver.

The patch adds of_node_put() to tegra_alc5632_remove() and
to error handling paths in the probe.

Found by Linux Driver Verification project (linuxtesting.org).

Signed-off-by: default avatarAlexey Khoroshilov <khoroshilov@ispras.ru>
Acked-by: default avatarJon Hunter <jonathanh@nvidia.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 7464d3fa

sound/soc/tegra/tegra_alc5632.c

+15 −2
Original line number Original line Diff line number Diff line
@@ -190,14 +190,14 @@ static int tegra_alc5632_probe(struct platform_device *pdev) 
		dev_err(&pdev->dev,

		dev_err(&pdev->dev,

			"Property 'nvidia,i2s-controller' missing or invalid\n");

			"Property 'nvidia,i2s-controller' missing or invalid\n");

		ret = -EINVAL;

		ret = -EINVAL;

		goto err;

		goto err_put_codec_of_node;

	}

	}





	tegra_alc5632_dai.platform_of_node = tegra_alc5632_dai.cpu_of_node;

	tegra_alc5632_dai.platform_of_node = tegra_alc5632_dai.cpu_of_node;





	ret = tegra_asoc_utils_init(&alc5632->util_data, &pdev->dev);

	ret = tegra_asoc_utils_init(&alc5632->util_data, &pdev->dev);

	if (ret)

	if (ret)

		goto err;

		goto err_put_cpu_of_node;





	ret = snd_soc_register_card(card);

	ret = snd_soc_register_card(card);

	if (ret) {

	if (ret) {
@@ -210,6 +210,13 @@ static int tegra_alc5632_probe(struct platform_device *pdev) 




err_fini_utils:

err_fini_utils:

	tegra_asoc_utils_fini(&alc5632->util_data);

	tegra_asoc_utils_fini(&alc5632->util_data);

err_put_cpu_of_node:

	of_node_put(tegra_alc5632_dai.cpu_of_node);

	tegra_alc5632_dai.cpu_of_node = NULL;

	tegra_alc5632_dai.platform_of_node = NULL;

err_put_codec_of_node:

	of_node_put(tegra_alc5632_dai.codec_of_node);

	tegra_alc5632_dai.codec_of_node = NULL;

err:

err:

	return ret;

	return ret;

}

}
@@ -223,6 +230,12 @@ static int tegra_alc5632_remove(struct platform_device *pdev) 




	tegra_asoc_utils_fini(&machine->util_data);

	tegra_asoc_utils_fini(&machine->util_data);





	of_node_put(tegra_alc5632_dai.cpu_of_node);

	tegra_alc5632_dai.cpu_of_node = NULL;

	tegra_alc5632_dai.platform_of_node = NULL;

	of_node_put(tegra_alc5632_dai.codec_of_node);

	tegra_alc5632_dai.codec_of_node = NULL;



	return 0;

	return 0;

}

}