On Sat, Jun 16, 2018 at 01:22:58AM +0300, Alexey Khoroshilov wrote:
tegra_rt5677_probe() gets a couple of device nodes with of_parse_phandle(), but there is no release of them.
The patch adds the release to tegra_rt5677_remove() and to error handling paths in the probe.
Found by Linux Driver Verification project (linuxtesting.org).
static int tegra_rt5677_probe(struct platform_device *pdev) { struct device_node *np = pdev->dev.of_node;
calls of_get_named_gpio() three times and then checks for -EPROBE_DEFER and bails out in that error cases. but of_get_named_gpio() may have incremented np at that point. The call try i think is:
of_get_named_gpio(np,....) -> of_get_named_gpio_flags() -> of_get_named_gpiod_flags() -> of_parse_phandle_with_args_map() -> of_for_each_phandle() -> of_phandle_iterator_next() -> of_find_node_by_phandle() -> of_node_get(np)
so that got refcounted as well and not decremented/released in the non -EPROBE_DEFER case. I think those should be added while cleaning up the other missing of_node_put() you detected below.
I think thos of_node_put() are also missing.
Signed-off-by: Alexey Khoroshilov khoroshilov@ispras.ru
Reviewed-by: Nicholas Mc Guire der.herr@hofr.at
sound/soc/tegra/tegra_rt5677.c | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-)
diff --git a/sound/soc/tegra/tegra_rt5677.c b/sound/soc/tegra/tegra_rt5677.c index 0e4805c7b4ca..7081f15302cc 100644 --- a/sound/soc/tegra/tegra_rt5677.c +++ b/sound/soc/tegra/tegra_rt5677.c @@ -264,13 +264,13 @@ static int tegra_rt5677_probe(struct platform_device *pdev) dev_err(&pdev->dev, "Property 'nvidia,i2s-controller' missing or invalid\n"); ret = -EINVAL;
goto err;
goto err_put_codec_of_node;} tegra_rt5677_dai.platform_of_node = tegra_rt5677_dai.cpu_of_node;
ret = tegra_asoc_utils_init(&machine->util_data, &pdev->dev); if (ret)
goto err;
goto err_put_cpu_of_node;ret = snd_soc_register_card(card); if (ret) {
@@ -283,6 +283,13 @@ static int tegra_rt5677_probe(struct platform_device *pdev)
err_fini_utils: tegra_asoc_utils_fini(&machine->util_data); +err_put_cpu_of_node:
- of_node_put(tegra_rt5677_dai.cpu_of_node);
- tegra_rt5677_dai.cpu_of_node = NULL;
- tegra_rt5677_dai.platform_of_node = NULL;
+err_put_codec_of_node:
- of_node_put(tegra_rt5677_dai.codec_of_node);
- tegra_rt5677_dai.codec_of_node = NULL;
err: return ret; } @@ -296,6 +303,12 @@ static int tegra_rt5677_remove(struct platform_device *pdev)
tegra_asoc_utils_fini(&machine->util_data);
- tegra_rt5677_dai.platform_of_node = NULL;
- of_node_put(tegra_rt5677_dai.codec_of_node);
- tegra_rt5677_dai.codec_of_node = NULL;
- of_node_put(tegra_rt5677_dai.cpu_of_node);
- tegra_rt5677_dai.cpu_of_node = NULL;
- return 0;
}
-- 2.7.4
SIL2review mailing list SIL2review@lists.osadl.org https://lists.osadl.org/mailman/listinfo/sil2review