[PATCH v3 1/2] drm/tegra: output: Don't leak OF node on error
The OF node should be put before returning error in tegra_output_probe(),
otherwise node's refcount will be leaked.
Signed-off-by: Dmitry Osipenko
---
drivers/gpu/drm/tegra/output.c | 9 -
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/drivers/gpu/drm/tegra/output.c b/drivers/gpu/drm/tegra/output.c
index e36e5e7c2f69..a6a711d54e88 100644
--- a/drivers/gpu/drm/tegra/output.c
+++ b/drivers/gpu/drm/tegra/output.c
@@ -102,10 +102,10 @@ int tegra_output_probe(struct tegra_output *output)
panel = of_parse_phandle(output->of_node, "nvidia,panel", 0);
if (panel) {
output->panel = of_drm_find_panel(panel);
+ of_node_put(panel);
+
if (IS_ERR(output->panel))
return PTR_ERR(output->panel);
-
- of_node_put(panel);
}
output->edid = of_get_property(output->of_node, "nvidia,edid", );
@@ -113,13 +113,12 @@ int tegra_output_probe(struct tegra_output *output)
ddc = of_parse_phandle(output->of_node, "nvidia,ddc-i2c-bus", 0);
if (ddc) {
output->ddc = of_find_i2c_adapter_by_node(ddc);
+ of_node_put(ddc);
+
if (!output->ddc) {
err = -EPROBE_DEFER;
- of_node_put(ddc);
return err;
}
-
- of_node_put(ddc);
}
output->hpd_gpio = devm_gpiod_get_from_of_node(output->dev,
--
2.26.0
___
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Re: [PATCH v3 1/2] drm/tegra: output: Don't leak OF node on error
16.04.2020 20:27, Laurent Pinchart пишет: > Hi Dmitry, > > Thank you for the patch. > > On Thu, Apr 16, 2020 at 08:24:04PM +0300, Dmitry Osipenko wrote: >> The OF node should be put before returning error in tegra_output_probe(), >> otherwise node's refcount will be leaked. >> >> Signed-off-by: Dmitry Osipenko > > Reviewed-by: Laurent Pinchart Hello Laurent, That is the fastest kernel review I ever got, thank you :) ___ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel
Re: [PATCH v3 1/2] drm/tegra: output: Don't leak OF node on error
Hi Dmitry, On Thu, Apr 16, 2020 at 08:30:24PM +0300, Dmitry Osipenko wrote: > 16.04.2020 20:27, Laurent Pinchart пишет: > > On Thu, Apr 16, 2020 at 08:24:04PM +0300, Dmitry Osipenko wrote: > >> The OF node should be put before returning error in tegra_output_probe(), > >> otherwise node's refcount will be leaked. > >> > >> Signed-off-by: Dmitry Osipenko > > > > Reviewed-by: Laurent Pinchart > > Hello Laurent, > > That is the fastest kernel review I ever got, thank you :) I think I'm also guilty for the slowest kernel reviews ever, so maybe in the end it will even out :-) -- Regards, Laurent Pinchart ___ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel
Re: [PATCH v3 1/2] drm/tegra: output: Don't leak OF node on error
Hi Dmitry,
Thank you for the patch.
On Thu, Apr 16, 2020 at 08:24:04PM +0300, Dmitry Osipenko wrote:
> The OF node should be put before returning error in tegra_output_probe(),
> otherwise node's refcount will be leaked.
>
> Signed-off-by: Dmitry Osipenko
Reviewed-by: Laurent Pinchart
> ---
> drivers/gpu/drm/tegra/output.c | 9 -
> 1 file changed, 4 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/gpu/drm/tegra/output.c b/drivers/gpu/drm/tegra/output.c
> index e36e5e7c2f69..a6a711d54e88 100644
> --- a/drivers/gpu/drm/tegra/output.c
> +++ b/drivers/gpu/drm/tegra/output.c
> @@ -102,10 +102,10 @@ int tegra_output_probe(struct tegra_output *output)
> panel = of_parse_phandle(output->of_node, "nvidia,panel", 0);
> if (panel) {
> output->panel = of_drm_find_panel(panel);
> + of_node_put(panel);
> +
> if (IS_ERR(output->panel))
> return PTR_ERR(output->panel);
> -
> - of_node_put(panel);
> }
>
> output->edid = of_get_property(output->of_node, "nvidia,edid", );
> @@ -113,13 +113,12 @@ int tegra_output_probe(struct tegra_output *output)
> ddc = of_parse_phandle(output->of_node, "nvidia,ddc-i2c-bus", 0);
> if (ddc) {
> output->ddc = of_find_i2c_adapter_by_node(ddc);
> + of_node_put(ddc);
> +
> if (!output->ddc) {
> err = -EPROBE_DEFER;
> - of_node_put(ddc);
> return err;
> }
> -
> - of_node_put(ddc);
> }
>
> output->hpd_gpio = devm_gpiod_get_from_of_node(output->dev,
--
Regards,
Laurent Pinchart
___
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
