From mboxrd@z Thu Jan 1 00:00:00 1970 From: Sasha Levin Subject: [PATCH AUTOSEL 4.9 31/33] drm/vmwgfx: fix memory leak when too many retries have occurred Date: Tue, 13 Aug 2019 22:23:21 -0400 Message-ID: <20190814022323.17111-31-sashal@kernel.org> References: <20190814022323.17111-1-sashal@kernel.org> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by gabe.freedesktop.org (Postfix) with ESMTPS id 053286E1C0 for ; Wed, 14 Aug 2019 02:24:14 +0000 (UTC) In-Reply-To: <20190814022323.17111-1-sashal@kernel.org> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Sasha Levin , Colin Ian King , Thomas Hellstrom , Deepak Rawat , dri-devel@lists.freedesktop.org List-Id: dri-devel@lists.freedesktop.org RnJvbTogQ29saW4gSWFuIEtpbmcgPGNvbGluLmtpbmdAY2Fub25pY2FsLmNvbT4KClsgVXBzdHJl YW0gY29tbWl0IDZiN2MzYjg2ZjBiNjMxMzRiMmFiNTY1MDg5MjFhMDg1M2ZmYTY4N2EgXQoKQ3Vy cmVudGx5IHdoZW4gdG9vIG1hbnkgcmV0cmllcyBoYXZlIG9jY3VycmVkIHRoZXJlIGlzIGEgbWVt b3J5CmxlYWsgb24gdGhlIGFsbG9jYXRpb24gZm9yIHJlcGx5IG9uIHRoZSBlcnJvciByZXR1cm4g cGF0aC4gRml4CnRoaXMgYnkga2ZyZWUnaW5nIHJlcGx5IGJlZm9yZSByZXR1cm5pbmcuCgpBZGRy ZXNzZXMtQ292ZXJpdHk6ICgiUmVzb3VyY2UgbGVhayIpCkZpeGVzOiBhOWNkOWMwNDRhYTkgKCJk cm0vdm13Z2Z4OiBBZGQgYSBjaGVjayB0byBoYW5kbGUgaG9zdCBtZXNzYWdlIGZhaWx1cmUiKQpT aWduZWQtb2ZmLWJ5OiBDb2xpbiBJYW4gS2luZyA8Y29saW4ua2luZ0BjYW5vbmljYWwuY29tPgpS ZXZpZXdlZC1ieTogRGVlcGFrIFJhd2F0IDxkcmF3YXRAdm13YXJlLmNvbT4KU2lnbmVkLW9mZi1i eTogRGVlcGFrIFJhd2F0IDxkcmF3YXRAdm13YXJlLmNvbT4KU2lnbmVkLW9mZi1ieTogVGhvbWFz IEhlbGxzdHJvbSA8dGhlbGxzdHJvbUB2bXdhcmUuY29tPgpTaWduZWQtb2ZmLWJ5OiBTYXNoYSBM ZXZpbiA8c2FzaGFsQGtlcm5lbC5vcmc+Ci0tLQogZHJpdmVycy9ncHUvZHJtL3Ztd2dmeC92bXdn ZnhfbXNnLmMgfCA0ICsrKy0KIDEgZmlsZSBjaGFuZ2VkLCAzIGluc2VydGlvbnMoKyksIDEgZGVs ZXRpb24oLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vdm13Z2Z4L3Ztd2dmeF9tc2cu YyBiL2RyaXZlcnMvZ3B1L2RybS92bXdnZngvdm13Z2Z4X21zZy5jCmluZGV4IGU1N2EwYmFkN2E2 MjYuLjc3ZGY1MGRkNmQzMGQgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS92bXdnZngvdm13 Z2Z4X21zZy5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS92bXdnZngvdm13Z2Z4X21zZy5jCkBAIC0z MDAsOCArMzAwLDEwIEBAIHN0YXRpYyBpbnQgdm13X3JlY3ZfbXNnKHN0cnVjdCBycGNfY2hhbm5l bCAqY2hhbm5lbCwgdm9pZCAqKm1zZywKIAkJYnJlYWs7CiAJfQogCi0JaWYgKHJldHJpZXMgPT0g UkVUUklFUykKKwlpZiAocmV0cmllcyA9PSBSRVRSSUVTKSB7CisJCWtmcmVlKHJlcGx5KTsKIAkJ cmV0dXJuIC1FSU5WQUw7CisJfQogCiAJKm1zZ19sZW4gPSByZXBseV9sZW47CiAJKm1zZyAgICAg PSByZXBseTsKLS0gCjIuMjAuMQoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX18KZHJpLWRldmVsIG1haWxpbmcgbGlzdApkcmktZGV2ZWxAbGlzdHMuZnJlZWRl c2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8v ZHJpLWRldmVs 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=-10.1 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,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 8A910C32750 for ; Wed, 14 Aug 2019 02:24:45 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 4FE7A20679 for ; Wed, 14 Aug 2019 02:24:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1565749485; bh=Zmf44+e0XE3x1uN8fCLZdo1CLwtdhJXzOTYsVc0cUwE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=f6fpPgibVG3eKwyS+YcSaQof+IrdrIh0/KDBWnDXV2FZr7rhKJeRgVoYonO8t783F +W1v47rY35yyjKcrQ71+WJxMeR5aZCWkCyJgAtLKBTo5RNsFi3wk3DE3thDWgx1Yaj iwS9uyJ7BqYquL1y4aUSXicATVswyMbs3KaWZ/P0= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729732AbfHNCYo (ORCPT ); Tue, 13 Aug 2019 22:24:44 -0400 Received: from mail.kernel.org ([198.145.29.99]:53122 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730124AbfHNCYO (ORCPT ); Tue, 13 Aug 2019 22:24:14 -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 2C9F52084F; Wed, 14 Aug 2019 02:24:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1565749453; bh=Zmf44+e0XE3x1uN8fCLZdo1CLwtdhJXzOTYsVc0cUwE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=O+6OkqUeVYdMvQyK5cvossnTrQBJLZZEFW6wxR7ks7YRFl6g0kjZI+CEYPYlxiWks vjY/E2J6/0pxiEFlKUgzi7V4vsHVj4kTkM+yPyjCpg0xDI0J4N/R47IOVLb7jIMYH1 7T5IWgC5n9BxqKWdeRXfKHmp2MOcDUl9gY34i8Dk= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Colin Ian King , Deepak Rawat , Thomas Hellstrom , Sasha Levin , dri-devel@lists.freedesktop.org Subject: [PATCH AUTOSEL 4.9 31/33] drm/vmwgfx: fix memory leak when too many retries have occurred Date: Tue, 13 Aug 2019 22:23:21 -0400 Message-Id: <20190814022323.17111-31-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190814022323.17111-1-sashal@kernel.org> References: <20190814022323.17111-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: Colin Ian King [ Upstream commit 6b7c3b86f0b63134b2ab56508921a0853ffa687a ] Currently when too many retries have occurred there is a memory leak on the allocation for reply on the error return path. Fix this by kfree'ing reply before returning. Addresses-Coverity: ("Resource leak") Fixes: a9cd9c044aa9 ("drm/vmwgfx: Add a check to handle host message failure") Signed-off-by: Colin Ian King Reviewed-by: Deepak Rawat Signed-off-by: Deepak Rawat Signed-off-by: Thomas Hellstrom Signed-off-by: Sasha Levin --- drivers/gpu/drm/vmwgfx/vmwgfx_msg.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_msg.c b/drivers/gpu/drm/vmwgfx/vmwgfx_msg.c index e57a0bad7a626..77df50dd6d30d 100644 --- a/drivers/gpu/drm/vmwgfx/vmwgfx_msg.c +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_msg.c @@ -300,8 +300,10 @@ static int vmw_recv_msg(struct rpc_channel *channel, void **msg, break; } - if (retries == RETRIES) + if (retries == RETRIES) { + kfree(reply); return -EINVAL; + } *msg_len = reply_len; *msg = reply; -- 2.20.1