diff options
| author | Quentin Casasnovas <quentin.casasnovas@oracle.com> | 2014-03-18 17:16:52 +0100 |
|---|---|---|
| committer | Christian König <christian.koenig@amd.com> | 2014-04-17 13:59:57 +0200 |
| commit | 74073c9dd29905645feb6dee03c144657a9844cd (patch) | |
| tree | e373ca2b975ce8b92e2f0f1d7456ccb1f778f560 | |
| parent | drm/radeon: fix VCE fence command (diff) | |
| download | linux-74073c9dd29905645feb6dee03c144657a9844cd.tar.xz linux-74073c9dd29905645feb6dee03c144657a9844cd.zip | |
drm/radeon: memory leak on bo reservation failure. v2
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: stable@vger.kernel.org
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>
| -rw-r--r-- | drivers/gpu/drm/radeon/radeon_kms.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/drivers/gpu/drm/radeon/radeon_kms.c b/drivers/gpu/drm/radeon/radeon_kms.c index 9337820e4d37..fb3d13f693dd 100644 --- a/drivers/gpu/drm/radeon/radeon_kms.c +++ b/drivers/gpu/drm/radeon/radeon_kms.c @@ -574,12 +574,17 @@ int radeon_driver_open_kms(struct drm_device *dev, struct drm_file *file_priv) } r = radeon_vm_init(rdev, &fpriv->vm); - if (r) + if (r) { + kfree(fpriv); return r; + } 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 */ |