From: Dmitry Osipenko <digetx-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> To: Thierry Reding <thierry.reding-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>, Sam Ravnborg <sam-uyr5N9Q2VtJg9hUCZPvPmw@public.gmane.org>, Laurent Pinchart <laurent.pinchart-ryLnwIuWjnjg/C1BVhZhaw@public.gmane.org> Cc: dri-devel-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org, linux-tegra-u79uwXL29TY76Z2rM5mHXA@public.gmane.org Subject: [PATCH v3 1/2] drm/tegra: output: Don't leak OF node on error Date: Thu, 16 Apr 2020 20:24:04 +0300 [thread overview] Message-ID: <20200416172405.5051-2-digetx@gmail.com> (raw) In-Reply-To: <20200416172405.5051-1-digetx-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> 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 <digetx-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> --- 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", &size); @@ -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
WARNING: multiple messages have this Message-ID (diff)
From: Dmitry Osipenko <digetx@gmail.com> To: Thierry Reding <thierry.reding@gmail.com>, Sam Ravnborg <sam@ravnborg.org>, Laurent Pinchart <laurent.pinchart@ideasonboard.com> Cc: linux-tegra@vger.kernel.org, dri-devel@lists.freedesktop.org Subject: [PATCH v3 1/2] drm/tegra: output: Don't leak OF node on error Date: Thu, 16 Apr 2020 20:24:04 +0300 [thread overview] Message-ID: <20200416172405.5051-2-digetx@gmail.com> (raw) In-Reply-To: <20200416172405.5051-1-digetx@gmail.com> 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 <digetx@gmail.com> --- 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", &size); @@ -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
next prev parent reply other threads:[~2020-04-16 17:24 UTC|newest] Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top 2020-04-16 17:24 [PATCH v3 0/2] Support DRM bridges on NVIDIA Tegra Dmitry Osipenko 2020-04-16 17:24 ` Dmitry Osipenko [not found] ` <20200416172405.5051-1-digetx-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> 2020-04-16 17:24 ` Dmitry Osipenko [this message] 2020-04-16 17:24 ` [PATCH v3 1/2] drm/tegra: output: Don't leak OF node on error Dmitry Osipenko [not found] ` <20200416172405.5051-2-digetx-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> 2020-04-16 17:27 ` Laurent Pinchart 2020-04-16 17:27 ` Laurent Pinchart [not found] ` <20200416172727.GN4796-N3hz7ZxfLydczECFQUw77jytWr6r+dGw0E9HWUfgJXw@public.gmane.org> 2020-04-16 17:30 ` Dmitry Osipenko 2020-04-16 17:30 ` Dmitry Osipenko [not found] ` <304a2a58-0031-bf88-6290-e72ab025d8c5-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> 2020-04-16 17:45 ` Laurent Pinchart 2020-04-16 17:45 ` Laurent Pinchart 2020-04-16 17:24 ` [PATCH v3 2/2] drm/tegra: output: rgb: Support LVDS encoder bridge Dmitry Osipenko 2020-04-16 17:24 ` Dmitry Osipenko [not found] ` <20200416172405.5051-3-digetx-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> 2020-04-16 17:41 ` Laurent Pinchart 2020-04-16 17:41 ` Laurent Pinchart [not found] ` <20200416174112.GS4796-N3hz7ZxfLydczECFQUw77jytWr6r+dGw0E9HWUfgJXw@public.gmane.org> 2020-04-16 18:52 ` Dmitry Osipenko 2020-04-16 18:52 ` Dmitry Osipenko [not found] ` <6275bcd3-c0b2-4c1c-1817-9e713d3747c7-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> 2020-04-16 20:21 ` Dmitry Osipenko 2020-04-16 20:21 ` Dmitry Osipenko [not found] ` <7cf27640-4fdc-8617-01cb-85f4c5847bb8-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> 2020-04-16 20:37 ` Sam Ravnborg 2020-04-16 20:37 ` Sam Ravnborg 2020-04-16 20:50 ` Laurent Pinchart 2020-04-16 20:50 ` Laurent Pinchart [not found] ` <20200416205012.GA28162-N3hz7ZxfLydczECFQUw77jytWr6r+dGw0E9HWUfgJXw@public.gmane.org> 2020-04-16 21:15 ` Dmitry Osipenko 2020-04-16 21:15 ` Dmitry Osipenko [not found] ` <fbafa641-f2ed-22b5-eaeb-bd2726b53d0a-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> 2020-04-16 21:39 ` Laurent Pinchart 2020-04-16 21:39 ` Laurent Pinchart [not found] ` <20200416213919.GB28162-N3hz7ZxfLydczECFQUw77jytWr6r+dGw0E9HWUfgJXw@public.gmane.org> 2020-04-16 22:22 ` Dmitry Osipenko 2020-04-16 22:22 ` Dmitry Osipenko
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20200416172405.5051-2-digetx@gmail.com \ --to=digetx-re5jqeeqqe8avxtiumwx3w@public.gmane.org \ --cc=dri-devel-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org \ --cc=laurent.pinchart-ryLnwIuWjnjg/C1BVhZhaw@public.gmane.org \ --cc=linux-tegra-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \ --cc=sam-uyr5N9Q2VtJg9hUCZPvPmw@public.gmane.org \ --cc=thierry.reding-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.