Re: [PATCH] drm/radeon: memory leak on bo reservation failure.

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Am 14.04.2014 23:43, schrieb Deucher, Alexander:
-----Original Message-----
From: Quentin Casasnovas [mailto:quentin.casasnovas@xxxxxxxxxx]
Sent: Tuesday, March 18, 2014 12:17 PM
To: David Airlie
Cc: linux-kernel@xxxxxxxxxxxxxxx; Quentin Casasnovas;
stable@xxxxxxxxxxxxxxx; Koenig, Christian; Deucher, Alexander
Subject: [PATCH] drm/radeon: memory leak on bo reservation failure.

On bo reservation failure, we end up leaking fpriv.

Fixes: 5e386b574cf7e1 ("drm/radeon: fix missing bo reservation")
Cc: stable@xxxxxxxxxxxxxxx
Cc: Christian König <christian.koenig@xxxxxxx>
Cc: Alex Deucher <alexander.deucher@xxxxxxx>
Signed-off-by: Quentin Casasnovas <quentin.casasnovas@xxxxxxxxxx>
Sorry I missed this.  It looks like we probably want an updated version for newer kernels where radeon_vm_init() can fail as well.

I've rebased the stuff and added the missing free on vm failure as well.

Patch is on the list and in my 3.15 queue.

Christian.


Reviewed-by: Alex Deucher <alexander.deucher@xxxxxxx>

Alex

---
  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 66ed3ea..51cda80 100644
--- a/drivers/gpu/drm/radeon/radeon_kms.c
+++ b/drivers/gpu/drm/radeon/radeon_kms.c
@@ -546,8 +546,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.8.3.2


--
To unsubscribe from this list: send the line "unsubscribe stable" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html




[Index of Archives]     [Linux Kernel]     [Kernel Development Newbies]     [Linux USB Devel]     [Video for Linux]     [Linux Audio Users]     [Yosemite Hiking]     [Linux Kernel]     [Linux SCSI]