ASoC: tegra_alc5632: fix device_node refcounting
authorAlexey Khoroshilov <khoroshilov@ispras.ru>
Fri, 27 Jul 2018 21:06:59 +0000 (00:06 +0300)
committerMark Brown <broonie@kernel.org>
Mon, 30 Jul 2018 11:02:29 +0000 (12:02 +0100)
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: Alexey Khoroshilov <khoroshilov@ispras.ru>
Acked-by: Jon Hunter <jonathanh@nvidia.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
sound/soc/tegra/tegra_alc5632.c

index 5197d6b18cb6758915c23d50b6f8b8dc7a515d07..98d87801d57a76ec10fa01f901a6009a71f0f5e0 100644 (file)
@@ -190,14 +190,14 @@ static int tegra_alc5632_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_alc5632_dai.platform_of_node = tegra_alc5632_dai.cpu_of_node;
 
        ret = tegra_asoc_utils_init(&alc5632->util_data, &pdev->dev);
        if (ret)
-               goto err;
+               goto err_put_cpu_of_node;
 
        ret = snd_soc_register_card(card);
        if (ret) {
@@ -210,6 +210,13 @@ static int tegra_alc5632_probe(struct platform_device *pdev)
 
 err_fini_utils:
        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:
        return ret;
 }
@@ -223,6 +230,12 @@ static int tegra_alc5632_remove(struct platform_device *pdev)
 
        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;
 }