2016-11-14 03:04:43

by Andrew Donnellan

[permalink] [raw]
Subject: [PATCH RESEND] drm/ast: free correct pointer in astfb_create() error paths

In the err_free_vram and err_release_fbi error paths in astfb_create(), we
attempt to free afbdev->sysram. The only jumps to these error paths occur
before we assign afbdev->sysram = sysram. Free sysram instead.

Signed-off-by: Andrew Donnellan <[email protected]>

---

Found by Coverity Scan. Compile tested only.
---
drivers/gpu/drm/ast/ast_fb.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/ast/ast_fb.c b/drivers/gpu/drm/ast/ast_fb.c
index 7a86e24..d6f5ec6 100644
--- a/drivers/gpu/drm/ast/ast_fb.c
+++ b/drivers/gpu/drm/ast/ast_fb.c
@@ -253,7 +253,7 @@ static int astfb_create(struct drm_fb_helper *helper,
err_release_fbi:
drm_fb_helper_release_fbi(helper);
err_free_vram:
- vfree(afbdev->sysram);
+ vfree(sysram);
return ret;
}

--
Andrew Donnellan OzLabs, ADL Canberra
[email protected] IBM Australia Limited


2016-11-14 06:46:59

by Daniel Vetter

[permalink] [raw]
Subject: Re: [PATCH RESEND] drm/ast: free correct pointer in astfb_create() error paths

On Mon, Nov 14, 2016 at 02:03:59PM +1100, Andrew Donnellan wrote:
> In the err_free_vram and err_release_fbi error paths in astfb_create(), we
> attempt to free afbdev->sysram. The only jumps to these error paths occur
> before we assign afbdev->sysram = sysram. Free sysram instead.
>
> Signed-off-by: Andrew Donnellan <[email protected]>

Applied to drm-misc, thanks.
-Daniel

>
> ---
>
> Found by Coverity Scan. Compile tested only.
> ---
> drivers/gpu/drm/ast/ast_fb.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/ast/ast_fb.c b/drivers/gpu/drm/ast/ast_fb.c
> index 7a86e24..d6f5ec6 100644
> --- a/drivers/gpu/drm/ast/ast_fb.c
> +++ b/drivers/gpu/drm/ast/ast_fb.c
> @@ -253,7 +253,7 @@ static int astfb_create(struct drm_fb_helper *helper,
> err_release_fbi:
> drm_fb_helper_release_fbi(helper);
> err_free_vram:
> - vfree(afbdev->sysram);
> + vfree(sysram);
> return ret;
> }
>
> --
> Andrew Donnellan OzLabs, ADL Canberra
> [email protected] IBM Australia Limited
>

--
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch