From mboxrd@z Thu Jan 1 00:00:00 1970 From: Sudip Mukherjee Subject: [PATCH RESEND 3/3] drm/amdgpu: fix memory leak Date: Thu, 8 Oct 2015 19:28:01 +0530 Message-ID: <1444312681-10149-3-git-send-email-sudipm.mukherjee@gmail.com> References: <1444312681-10149-1-git-send-email-sudipm.mukherjee@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail-pa0-f47.google.com (mail-pa0-f47.google.com [209.85.220.47]) by gabe.freedesktop.org (Postfix) with ESMTPS id DC1786ECE6 for ; Thu, 8 Oct 2015 06:58:16 -0700 (PDT) Received: by pabve7 with SMTP id ve7so15150732pab.2 for ; Thu, 08 Oct 2015 06:58:16 -0700 (PDT) In-Reply-To: <1444312681-10149-1-git-send-email-sudipm.mukherjee@gmail.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: David Airlie , Daniel Vetter Cc: linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, Sudip Mukherjee , Alex Deucher , =?UTF-8?q?Christian=20K=C3=B6nig?= , "monk.liu" List-Id: dri-devel@lists.freedesktop.org SWYgYW1kZ3B1X2liX2dldCgpIGZhaWxzIHdlIHJldHVybmVkIHRoZSBlcnJvciBjb2RlIGJ1dCB3 ZSBtaXNzZWQKZnJlZWluZyBpYi4KCkNjOiAiQ2hyaXN0aWFuIEvDtm5pZyIgPGNocmlzdGlhbi5r b2VuaWdAYW1kLmNvbT4KQ2M6IEphbW15IFpob3UgPEphbW15Llpob3VAYW1kLmNvbT4KQ2M6IENo dW5taW5nIFpob3UgPGRhdmlkMS56aG91QGFtZC5jb20+CkNjOiBBbGV4IERldWNoZXIgPGFsZXhh bmRlci5kZXVjaGVyQGFtZC5jb20+CkNjOiAibW9uay5saXUiIDxtb25rLmxpdUBhbWQuY29tPgpT aWduZWQtb2ZmLWJ5OiBTdWRpcCBNdWtoZXJqZWUgPHN1ZGlwQHZlY3RvcmluZGlhLm9yZz4KLS0t CgpTZW50IG9uIDE4LzA5LzIwMTUgCgogZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1 X3ZtLmMgfCA0ICsrKy0KIDEgZmlsZSBjaGFuZ2VkLCAzIGluc2VydGlvbnMoKyksIDEgZGVsZXRp b24oLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRncHVfdm0u YyBiL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdwdV92bS5jCmluZGV4IDFlMTQ1MzEu LjUzZDU1MWYgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdwdV92 bS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdwdV92bS5jCkBAIC00NTUs OCArNDU1LDEwIEBAIGludCBhbWRncHVfdm1fdXBkYXRlX3BhZ2VfZGlyZWN0b3J5KHN0cnVjdCBh bWRncHVfZGV2aWNlICphZGV2LAogCQlyZXR1cm4gLUVOT01FTTsKIAogCXIgPSBhbWRncHVfaWJf Z2V0KHJpbmcsIE5VTEwsIG5kdyAqIDQsIGliKTsKLQlpZiAocikKKwlpZiAocikgeworCQlrZnJl ZShpYik7CiAJCXJldHVybiByOworCX0KIAlpYi0+bGVuZ3RoX2R3ID0gMDsKIAogCS8qIHdhbGsg b3ZlciB0aGUgYWRkcmVzcyBzcGFjZSBhbmQgdXBkYXRlIHRoZSBwYWdlIGRpcmVjdG9yeSAqLwot LSAKMS45LjEKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f CmRyaS1kZXZlbCBtYWlsaW5nIGxpc3QKZHJpLWRldmVsQGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpo dHRwOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vZHJpLWRldmVsCg== From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932809AbbJHN6U (ORCPT ); Thu, 8 Oct 2015 09:58:20 -0400 Received: from mail-pa0-f43.google.com ([209.85.220.43]:36493 "EHLO mail-pa0-f43.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756983AbbJHN6R (ORCPT ); Thu, 8 Oct 2015 09:58:17 -0400 From: Sudip Mukherjee To: David Airlie , Daniel Vetter Cc: linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, Sudip Mukherjee , =?UTF-8?q?Christian=20K=C3=B6nig?= , Jammy Zhou , Chunming Zhou , Alex Deucher , "monk.liu" Subject: [PATCH RESEND 3/3] drm/amdgpu: fix memory leak Date: Thu, 8 Oct 2015 19:28:01 +0530 Message-Id: <1444312681-10149-3-git-send-email-sudipm.mukherjee@gmail.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1444312681-10149-1-git-send-email-sudipm.mukherjee@gmail.com> References: <1444312681-10149-1-git-send-email-sudipm.mukherjee@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org If amdgpu_ib_get() fails we returned the error code but we missed freeing ib. Cc: "Christian König" Cc: Jammy Zhou Cc: Chunming Zhou Cc: Alex Deucher Cc: "monk.liu" Signed-off-by: Sudip Mukherjee --- Sent on 18/09/2015 drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c index 1e14531..53d551f 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c @@ -455,8 +455,10 @@ int amdgpu_vm_update_page_directory(struct amdgpu_device *adev, return -ENOMEM; r = amdgpu_ib_get(ring, NULL, ndw * 4, ib); - if (r) + if (r) { + kfree(ib); return r; + } ib->length_dw = 0; /* walk over the address space and update the page directory */ -- 1.9.1