2022-05-13 12:25:56

by Miaoqian Lin

Subject: [PATCH] video: fbdev: Fix refcount leak in clcdfb_of_vram_setup

of_parse_phandle() returns a node pointer with refcount
incremented, we should use of_node_put() on it when not need anymore.
Add missing of_node_put() to avoid refcount leak.

Fixes: d10715be03bd ("video: ARM CLCD: Add DT support")
Signed-off-by: Miaoqian Lin <[email protected]>
---
drivers/video/fbdev/amba-clcd.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/drivers/video/fbdev/amba-clcd.c b/drivers/video/fbdev/amba-clcd.c
index 9ec969e136bf..8080116aea84 100644
--- a/drivers/video/fbdev/amba-clcd.c
+++ b/drivers/video/fbdev/amba-clcd.c
@@ -758,12 +758,15 @@ static int clcdfb_of_vram_setup(struct clcd_fb *fb)
return -ENODEV;

fb->fb.screen_base = of_iomap(memory, 0);
- if (!fb->fb.screen_base)
+ if (!fb->fb.screen_base) {
+ of_node_put(memory);
return -ENOMEM;
+ }

fb->fb.fix.smem_start = of_translate_address(memory,
of_get_address(memory, 0, &size, NULL));
fb->fb.fix.smem_len = size;
+ of_node_put(memory);

return 0;
}
--
2.25.1

2022-05-19 09:25:46

by Helge Deller

Subject: Re: [PATCH] video: fbdev: Fix refcount leak in clcdfb_of_vram_setup

On 5/12/22 13:59, Miaoqian Lin wrote:
> of_parse_phandle() returns a node pointer with refcount
> incremented, we should use of_node_put() on it when not need anymore.
> Add missing of_node_put() to avoid refcount leak.
>
> Fixes: d10715be03bd ("video: ARM CLCD: Add DT support")
> Signed-off-by: Miaoqian Lin <[email protected]>

applied to the fbdev tree.
Thanks!
Helge

> ---
> drivers/video/fbdev/amba-clcd.c | 5 ++++-
> 1 file changed, 4 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/video/fbdev/amba-clcd.c b/drivers/video/fbdev/amba-clcd.c
> index 9ec969e136bf..8080116aea84 100644
> --- a/drivers/video/fbdev/amba-clcd.c
> +++ b/drivers/video/fbdev/amba-clcd.c
> @@ -758,12 +758,15 @@ static int clcdfb_of_vram_setup(struct clcd_fb *fb)
> return -ENODEV;
>
> fb->fb.screen_base = of_iomap(memory, 0);
> - if (!fb->fb.screen_base)
> + if (!fb->fb.screen_base) {
> + of_node_put(memory);
> return -ENOMEM;
> + }
>
> fb->fb.fix.smem_start = of_translate_address(memory,
> of_get_address(memory, 0, &size, NULL));
> fb->fb.fix.smem_len = size;
> + of_node_put(memory);
>
> return 0;
> }