diff options
author | Quentin Casasnovas <quentin.casasnovas@oracle.com> | 2014-03-18 12:16:52 -0400 |
---|---|---|
committer | Christian König <christian.koenig@amd.com> | 2014-04-17 07:59:57 -0400 |
commit | 74073c9dd29905645feb6dee03c144657a9844cd (patch) | |
tree | e373ca2b975ce8b92e2f0f1d7456ccb1f778f560 | |
parent | 681941c1790b92207334d08ee017007685f35438 (diff) |
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) | |||
574 | } | 574 | } |
575 | 575 | ||
576 | r = radeon_vm_init(rdev, &fpriv->vm); | 576 | r = radeon_vm_init(rdev, &fpriv->vm); |
577 | if (r) | 577 | if (r) { |
578 | kfree(fpriv); | ||
578 | return r; | 579 | return r; |
580 | } | ||
579 | 581 | ||
580 | r = radeon_bo_reserve(rdev->ring_tmp_bo.bo, false); | 582 | r = radeon_bo_reserve(rdev->ring_tmp_bo.bo, false); |
581 | if (r) | 583 | if (r) { |
584 | radeon_vm_fini(rdev, &fpriv->vm); | ||
585 | kfree(fpriv); | ||
582 | return r; | 586 | return r; |
587 | } | ||
583 | 588 | ||
584 | /* map the ib pool buffer read only into | 589 | /* map the ib pool buffer read only into |
585 | * virtual address space */ | 590 | * virtual address space */ |