> -----Original Message----- > From: Quentin Casasnovas [mailto:quentin.casasno...@oracle.com] > Sent: Tuesday, March 18, 2014 12:17 PM > To: David Airlie > Cc: linux-kernel@vger.kernel.org; Quentin Casasnovas; > sta...@vger.kernel.org; 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: sta...@vger.kernel.org > Cc: Christian König <christian.koe...@amd.com> > Cc: Alex Deucher <alexander.deuc...@amd.com> > Signed-off-by: Quentin Casasnovas <quentin.casasno...@oracle.com>
Sorry I missed this. It looks like we probably want an updated version for newer kernels where radeon_vm_init() can fail as well. Reviewed-by: Alex Deucher <alexander.deuc...@amd.com> 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 > N�����r��y����b�X��ǧv�^�){.n�+����{����zX����ܨ}���Ơz�&j:+v�������zZ+��+zf���h���~����i���z��w���?�����&�)ߢf��^jǫy�m��@A�a��� 0��h���i