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 72F4BC32750 for ; Wed, 14 Aug 2019 02:23:09 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 417D720679 for ; Wed, 14 Aug 2019 02:23:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1565749389; bh=yZiJ8rf/cHJGFNppWirptWcXt6eDQ6i695avXVJEEl0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=lC8HI6ZREfQksJ8cvKLuvPKg71mmUBFANnpz1RyKfLYjjNyonEHS5F3lv6wq5/IQ5 L82sgFvyRFroGprieeTmk5XvHBaXxn5WEorIaGVpp2e3rDlUiGrFxEql4NAt4mMKmn GdhmcvNiOHxBOK+5nU/Cvl7iTgKpRmF+gTXRs6aM= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729414AbfHNCRa (ORCPT ); Tue, 13 Aug 2019 22:17:30 -0400 Received: from mail.kernel.org ([198.145.29.99]:48772 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729313AbfHNCR3 (ORCPT ); Tue, 13 Aug 2019 22:17:29 -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 4DDF72085A; Wed, 14 Aug 2019 02:17:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1565749048; bh=yZiJ8rf/cHJGFNppWirptWcXt6eDQ6i695avXVJEEl0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=hLSoiaPUxnfZpSPvqtpd4ZjdpTrilnIXj3ZLzeuYDjpvp/W5DdZs30RSo/gNP5SnU Szuzp/Q3+Dwaf3WeFCqR1exQT5DGhl6PwzXywqx9ZoNrP1TXBjSBbNbRnXo1UcyH7n LGTRtGdn9amyhADMnyGYGWevvtao81af3YJmLmoY= 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.19 61/68] drm/vmwgfx: fix memory leak when too many retries have occurred Date: Tue, 13 Aug 2019 22:15:39 -0400 Message-Id: <20190814021548.16001-61-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190814021548.16001-1-sashal@kernel.org> References: <20190814021548.16001-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@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 e4e09d47c5c0e..59e9d05ab928b 100644 --- a/drivers/gpu/drm/vmwgfx/vmwgfx_msg.c +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_msg.c @@ -389,8 +389,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