From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Message-ID: <534CFCEF.1050403@amd.com> Date: Tue, 15 Apr 2014 11:33:35 +0200 From: =?UTF-8?B?Q2hyaXN0aWFuIEvDtm5pZw==?= MIME-Version: 1.0 To: "Deucher, Alexander" , Quentin Casasnovas , David Airlie CC: "linux-kernel@vger.kernel.org" , "stable@vger.kernel.org" Subject: Re: [PATCH] drm/radeon: memory leak on bo reservation failure. References: <1395159412-12377-1-git-send-email-quentin.casasnovas@oracle.com> In-Reply-To: Content-Type: text/plain; charset="UTF-8"; format=flowed Content-Transfer-Encoding: 8BIT Sender: linux-kernel-owner@vger.kernel.org List-ID: Am 14.04.2014 23:43, schrieb Deucher, Alexander: >> -----Original Message----- >> From: Quentin Casasnovas [mailto:quentin.casasnovas@oracle.com] >> Sent: Tuesday, March 18, 2014 12:17 PM >> To: David Airlie >> Cc: linux-kernel@vger.kernel.org; Quentin Casasnovas; >> stable@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: stable@vger.kernel.org >> Cc: Christian König >> Cc: Alex Deucher >> Signed-off-by: Quentin Casasnovas > 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 > > 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 >>