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=-9.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,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 59AC7C3A5AA for ; Wed, 4 Sep 2019 18:25:44 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 2A5FB20870 for ; Wed, 4 Sep 2019 18:25:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1567621544; bh=Rz5W86QNLhm8ZYZlo6tOUZ86rEbHzRkh+dT4ZEkT3eo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=zC9vJ5fVrw3twGqLzTumWk8BhEgTpYM7crv0cHJwtHLrwvuJCyB+ddXAVAFoSRxdk z/nbqTXJv370Pksy9gXdPssKFSTNizBDYhJQqdwJHVo5U6nH7rLvonae/IEgDvIANv 0mAL4f5tI7LxCcFm+MBQ5OOxKPzJtjjOjvIiBKys= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388245AbfIDR7e (ORCPT ); Wed, 4 Sep 2019 13:59:34 -0400 Received: from mail.kernel.org ([198.145.29.99]:38436 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2388244AbfIDR7d (ORCPT ); Wed, 4 Sep 2019 13:59:33 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 2202B22CEA; Wed, 4 Sep 2019 17:59:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1567619972; bh=Rz5W86QNLhm8ZYZlo6tOUZ86rEbHzRkh+dT4ZEkT3eo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=qgOJ/2JLjJSsCGlX7G3enaYb8fGbEMQE7mHCTvKftXn2PYvvubM95dWUq8BQqzuhC BS9bk1hX89TntEHOLNlAzLRzBfCFmW4rs9b22k11CKNRV57AJBYP5CyNqsQ5oUwvEs zaLPZY50tl1j+w0L+Tj5vnzFVxRGB5rAkXMEmmDY= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Colin Ian King , Deepak Rawat , Thomas Hellstrom , Sasha Levin Subject: [PATCH 4.9 25/83] drm/vmwgfx: fix memory leak when too many retries have occurred Date: Wed, 4 Sep 2019 19:53:17 +0200 Message-Id: <20190904175306.098695604@linuxfoundation.org> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20190904175303.488266791@linuxfoundation.org> References: <20190904175303.488266791@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org [ 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