lkml.org 
[lkml]   [2015]   [Sep]   [7]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH] drm/mgag200: fix memory leak
    Date
    If drm_fb_helper_alloc_fbi() fails then we were directly returning
    without freeing sysram. Also if drm_fb_helper_alloc_fbi() succeeds but
    mgag200_framebuffer_init() fails then we were not releasing sysram and
    we were not releasing fbi helper also.

    Signed-off-by: Sudip Mukherjee <sudip@vectorindia.org>
    ---
    drivers/gpu/drm/mgag200/mgag200_fb.c | 15 ++++++++++++---
    1 file changed, 12 insertions(+), 3 deletions(-)

    diff --git a/drivers/gpu/drm/mgag200/mgag200_fb.c b/drivers/gpu/drm/mgag200/mgag200_fb.c
    index 87de15e..5fe476a 100644
    --- a/drivers/gpu/drm/mgag200/mgag200_fb.c
    +++ b/drivers/gpu/drm/mgag200/mgag200_fb.c
    @@ -189,14 +189,16 @@ static int mgag200fb_create(struct drm_fb_helper *helper,
    return -ENOMEM;

    info = drm_fb_helper_alloc_fbi(helper);
    - if (IS_ERR(info))
    - return PTR_ERR(info);
    + if (IS_ERR(info)) {
    + ret = PTR_ERR(info);
    + goto err_alloc_fbi;
    + }

    info->par = mfbdev;

    ret = mgag200_framebuffer_init(dev, &mfbdev->mfb, &mode_cmd, gobj);
    if (ret)
    - return ret;
    + goto err_framebuffer_init;

    mfbdev->sysram = sysram;
    mfbdev->size = size;
    @@ -226,6 +228,13 @@ static int mgag200fb_create(struct drm_fb_helper *helper,
    DRM_DEBUG_KMS("allocated %dx%d\n",
    fb->width, fb->height);
    return 0;
    +
    +err_framebuffer_init:
    + drm_fb_helper_release_fbi(helper);
    +
    +err_alloc_fbi:
    + vfree(sysram);
    + return ret;
    }

    static int mga_fbdev_destroy(struct drm_device *dev,
    --
    1.9.1


    \
     
     \ /
      Last update: 2015-09-07 14:21    [W:3.761 / U:0.032 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site