From mboxrd@z Thu Jan 1 00:00:00 1970 From: Sasha Levin Subject: [PATCH AUTOSEL 5.2 027/171] drm/amdkfd: Fix a potential memory leak Date: Thu, 18 Jul 2019 23:54:18 -0400 Message-ID: <20190719035643.14300-27-sashal@kernel.org> References: <20190719035643.14300-1-sashal@kernel.org> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20190719035643.14300-1-sashal-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org> List-Id: Discussion list for AMD gfx List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: amd-gfx-bounces-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org Sender: "amd-gfx" To: linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, stable-u79uwXL29TY76Z2rM5mHXA@public.gmane.org Cc: Sasha Levin , Felix Kuehling , amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org, dri-devel-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org, Alex Deucher , Oak Zeng RnJvbTogT2FrIFplbmcgPG96ZW5nQGFtZC5jb20+CgpbIFVwc3RyZWFtIGNvbW1pdCBlNzMzOTBk MTgxMTAzYTE5ZTExMTFlYzJmMjU1NTlhMDU3MGU5ZmUwIF0KCkZyZWUgbXFkX21lbV9vYmogaXQg R1RUIGJ1ZmZlciBhbGxvY2F0aW9uIGZvciBNUUQrY29udHJvbCBzdGFjayBmYWlscy4KClNpZ25l ZC1vZmYtYnk6IE9hayBaZW5nIDxvemVuZ0BhbWQuY29tPgpSZXZpZXdlZC1ieTogRmVsaXggS3Vl aGxpbmcgPEZlbGl4Lkt1ZWhsaW5nQGFtZC5jb20+ClNpZ25lZC1vZmYtYnk6IEZlbGl4IEt1ZWhs aW5nIDxGZWxpeC5LdWVobGluZ0BhbWQuY29tPgpTaWduZWQtb2ZmLWJ5OiBBbGV4IERldWNoZXIg PGFsZXhhbmRlci5kZXVjaGVyQGFtZC5jb20+ClNpZ25lZC1vZmYtYnk6IFNhc2hhIExldmluIDxz YXNoYWxAa2VybmVsLm9yZz4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGtmZC9rZmRfbXFk X21hbmFnZXJfdjkuYyB8IDUgKysrKy0KIDEgZmlsZSBjaGFuZ2VkLCA0IGluc2VydGlvbnMoKyks IDEgZGVsZXRpb24oLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGtmZC9r ZmRfbXFkX21hbmFnZXJfdjkuYyBiL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1ka2ZkL2tmZF9tcWRf bWFuYWdlcl92OS5jCmluZGV4IDlkYmJhNjA5NDUwZS4uOGZlNzRiODIxYjMyIDEwMDY0NAotLS0g YS9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGtmZC9rZmRfbXFkX21hbmFnZXJfdjkuYworKysgYi9k cml2ZXJzL2dwdS9kcm0vYW1kL2FtZGtmZC9rZmRfbXFkX21hbmFnZXJfdjkuYwpAQCAtNzYsNiAr NzYsNyBAQCBzdGF0aWMgaW50IGluaXRfbXFkKHN0cnVjdCBtcWRfbWFuYWdlciAqbW0sIHZvaWQg KiptcWQsCiAJc3RydWN0IHY5X21xZCAqbTsKIAlzdHJ1Y3Qga2ZkX2RldiAqa2ZkID0gbW0tPmRl djsKIAorCSptcWRfbWVtX29iaiA9IE5VTEw7CiAJLyogRnJvbSBWOSwgIGZvciBDV1NSLCB0aGUg Y29udHJvbCBzdGFjayBpcyBsb2NhdGVkIG9uIHRoZSBuZXh0IHBhZ2UKIAkgKiBib3VuZGFyeSBh ZnRlciB0aGUgbXFkLCB3ZSB3aWxsIHVzZSB0aGUgZ3R0IGFsbG9jYXRpb24gZnVuY3Rpb24KIAkg KiBpbnN0ZWFkIG9mIHN1Yi1hbGxvY2F0aW9uIGZ1bmN0aW9uLgpAQCAtOTMsOCArOTQsMTAgQEAg c3RhdGljIGludCBpbml0X21xZChzdHJ1Y3QgbXFkX21hbmFnZXIgKm1tLCB2b2lkICoqbXFkLAog CX0gZWxzZQogCQlyZXR2YWwgPSBrZmRfZ3R0X3NhX2FsbG9jYXRlKG1tLT5kZXYsIHNpemVvZihz dHJ1Y3QgdjlfbXFkKSwKIAkJCQltcWRfbWVtX29iaik7Ci0JaWYgKHJldHZhbCAhPSAwKQorCWlm IChyZXR2YWwpIHsKKwkJa2ZyZWUoKm1xZF9tZW1fb2JqKTsKIAkJcmV0dXJuIC1FTk9NRU07CisJ fQogCiAJbSA9IChzdHJ1Y3QgdjlfbXFkICopICgqbXFkX21lbV9vYmopLT5jcHVfcHRyOwogCWFk ZHIgPSAoKm1xZF9tZW1fb2JqKS0+Z3B1X2FkZHI7Ci0tIAoyLjIwLjEKCl9fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCmFtZC1nZnggbWFpbGluZyBsaXN0CmFt ZC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3Jn L21haWxtYW4vbGlzdGluZm8vYW1kLWdmeA== From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.3 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,UNWANTED_LANGUAGE_BODY,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id DF55DC76195 for ; Fri, 19 Jul 2019 04:40:28 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id AFC26206DD for ; Fri, 19 Jul 2019 04:40:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1563511228; bh=teggvQp7PWhRrkJMsK/tso+6YAghi15Fw5s2In74K+w=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=o1s0NnigJC21jgSLllwVl/K4EAWDOVndU8I6zKBK77iWm07NZ69nGT+KF7CiWsWpA sBFMD8YTh++OWIHSkPm15cX1ZytWpE0nOQ3nNy8rD+2fHphG7tR0knuR4b4H2gCibn uQTrDP1p9649/92K93cKpU0w3VeAeR7YFDWfGyL8= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727679AbfGSD56 (ORCPT ); Thu, 18 Jul 2019 23:57:58 -0400 Received: from mail.kernel.org ([198.145.29.99]:57148 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727620AbfGSD54 (ORCPT ); Thu, 18 Jul 2019 23:57:56 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id B2FD92184E; Fri, 19 Jul 2019 03:57:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1563508675; bh=teggvQp7PWhRrkJMsK/tso+6YAghi15Fw5s2In74K+w=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=N9COdVf0Hd9WaT0PYoM7xHc2/B4FxwrPC6Rwp19SwdXktEmWe5CDE+Ibgvmf+zUmk rK6Cu4b1V+gX7D+rYNU3GOvF+nmBtc10C5ervaXOVRdk/o9U2yMOu1lw0OjNoGBAmv ZfGYNLAj99xH+Iz3IFK9GAkC0cVvBWGPezYekdFY= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Oak Zeng , Felix Kuehling , Alex Deucher , Sasha Levin , dri-devel@lists.freedesktop.org, amd-gfx@lists.freedesktop.org Subject: [PATCH AUTOSEL 5.2 027/171] drm/amdkfd: Fix a potential memory leak Date: Thu, 18 Jul 2019 23:54:18 -0400 Message-Id: <20190719035643.14300-27-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190719035643.14300-1-sashal@kernel.org> References: <20190719035643.14300-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Oak Zeng [ Upstream commit e73390d181103a19e1111ec2f25559a0570e9fe0 ] Free mqd_mem_obj it GTT buffer allocation for MQD+control stack fails. Signed-off-by: Oak Zeng Reviewed-by: Felix Kuehling Signed-off-by: Felix Kuehling Signed-off-by: Alex Deucher Signed-off-by: Sasha Levin --- drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v9.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v9.c b/drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v9.c index 9dbba609450e..8fe74b821b32 100644 --- a/drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v9.c +++ b/drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v9.c @@ -76,6 +76,7 @@ static int init_mqd(struct mqd_manager *mm, void **mqd, struct v9_mqd *m; struct kfd_dev *kfd = mm->dev; + *mqd_mem_obj = NULL; /* From V9, for CWSR, the control stack is located on the next page * boundary after the mqd, we will use the gtt allocation function * instead of sub-allocation function. @@ -93,8 +94,10 @@ static int init_mqd(struct mqd_manager *mm, void **mqd, } else retval = kfd_gtt_sa_allocate(mm->dev, sizeof(struct v9_mqd), mqd_mem_obj); - if (retval != 0) + if (retval) { + kfree(*mqd_mem_obj); return -ENOMEM; + } m = (struct v9_mqd *) (*mqd_mem_obj)->cpu_ptr; addr = (*mqd_mem_obj)->gpu_addr; -- 2.20.1