lkml.org 
[lkml]   [2014]   [Apr]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.11 171/182] drm/radeon: memory leak on bo reservation failure. v2
    Date
    3.11.10.9 -stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Quentin Casasnovas <quentin.casasnovas@oracle.com>

    commit 74073c9dd29905645feb6dee03c144657a9844cd upstream.

    On bo reservation failure, we end up leaking fpriv.

    v2 (chk): rebased and added missing free on vm failure as well

    Fixes: 5e386b574cf7e1 ("drm/radeon: fix missing bo reservation")
    Cc: Christian König <christian.koenig@amd.com>
    Cc: Alex Deucher <alexander.deucher@amd.com>
    Signed-off-by: Quentin Casasnovas <quentin.casasnovas@oracle.com>
    Signed-off-by: Christian König <christian.koenig@amd.com>
    [ luis: backported to 3.11:
    - radeon_vm_init() returns a value only after commit 6d2f294
    "drm/radeon: use normal BOs for the page tables v4", which is not
    in 3.11 kernel, thus dropped 1st chunk of commit ]
    Signed-off-by: Luis Henriques <luis.henriques@canonical.com>
    ---
    drivers/gpu/drm/radeon/radeon_kms.c | 5 ++++-
    1 file changed, 4 insertions(+), 1 deletion(-)

    diff --git a/drivers/gpu/drm/radeon/radeon_kms.c b/drivers/gpu/drm/radeon/radeon_kms.c
    index 42ff84b..82b8710 100644
    --- a/drivers/gpu/drm/radeon/radeon_kms.c
    +++ b/drivers/gpu/drm/radeon/radeon_kms.c
    @@ -505,8 +505,11 @@ int radeon_driver_open_kms(struct drm_device *dev, struct drm_file *file_priv)
    radeon_vm_init(rdev, &fpriv->vm);

    r = radeon_bo_reserve(rdev->ring_tmp_bo.bo, false);
    - if (r)
    + if (r) {
    + radeon_vm_fini(rdev, &fpriv->vm);
    + kfree(fpriv);
    return r;
    + }

    /* map the ib pool buffer read only into
    * virtual address space */
    --
    1.9.1
    --
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/

    \
     
     \ /
      Last update: 2014-04-24 13:21    [W:7.160 / U:0.016 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site