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.0 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,T_DKIMWL_WL_HIGH,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham 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 BC6DCC28CC0 for ; Thu, 30 May 2019 03:42:30 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 961F324C3D for ; Thu, 30 May 2019 03:42:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1559187750; bh=vYAoTxErGQYqbKWmND6VrkBSraZ9jAq4UoHhROvyS5w=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=SsZlCUK8mC3pohZ3EXVih/dIMLddnwIrDhBeoUfOx9wJWOC5Zqh+E9/TxvRGsJzIq UUTFwjzOyxW7hTo/7PzgENvGf+KHUnNpRQz4UvIwo30OF3mZar9e6MTo5KwufMYlSS sw0f9KLAeSha/3fO725Ng7fF6k9UUNPI7lkAfRXw= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730589AbfE3Dm3 (ORCPT ); Wed, 29 May 2019 23:42:29 -0400 Received: from mail.kernel.org ([198.145.29.99]:33154 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732461AbfE3DVI (ORCPT ); Wed, 29 May 2019 23:21:08 -0400 Received: from localhost (ip67-88-213-2.z213-88-67.customer.algx.net [67.88.213.2]) (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 96E15249BF; Thu, 30 May 2019 03:21:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1559186467; bh=vYAoTxErGQYqbKWmND6VrkBSraZ9jAq4UoHhROvyS5w=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=RaUdoC2RZfQIg81ISc6hDo2WenNPlNtUI7DiR5XkbvncrUJ7N5cnQwxAkAMqpTXeq anp68irNQjqH9ZtcEXc2prtrJnTLV6G2n+zKAWMe2VuYwAWxFVQ9Xr22LxYdfl4W8K 0LxMUJqQAICOI1FYSdiRG6Ri/fgiKRfKv2puq5zM= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, YueHaibing , Kalle Valo , Sasha Levin Subject: [PATCH 4.9 093/128] mwifiex: Fix mem leak in mwifiex_tm_cmd Date: Wed, 29 May 2019 20:07:05 -0700 Message-Id: <20190530030451.436111915@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190530030432.977908967@linuxfoundation.org> References: <20190530030432.977908967@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 003b686ace820ce2d635a83f10f2d7f9c147dabc ] 'hostcmd' is alloced by kzalloc, should be freed before leaving from the error handling cases, otherwise it will cause mem leak. Fixes: 3935ccc14d2c ("mwifiex: add cfg80211 testmode support") Signed-off-by: YueHaibing Signed-off-by: Kalle Valo Signed-off-by: Sasha Levin --- drivers/net/wireless/marvell/mwifiex/cfg80211.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/drivers/net/wireless/marvell/mwifiex/cfg80211.c b/drivers/net/wireless/marvell/mwifiex/cfg80211.c index 4da3541471e61..46d0099fd6e82 100644 --- a/drivers/net/wireless/marvell/mwifiex/cfg80211.c +++ b/drivers/net/wireless/marvell/mwifiex/cfg80211.c @@ -4018,16 +4018,20 @@ static int mwifiex_tm_cmd(struct wiphy *wiphy, struct wireless_dev *wdev, if (mwifiex_send_cmd(priv, 0, 0, 0, hostcmd, true)) { dev_err(priv->adapter->dev, "Failed to process hostcmd\n"); + kfree(hostcmd); return -EFAULT; } /* process hostcmd response*/ skb = cfg80211_testmode_alloc_reply_skb(wiphy, hostcmd->len); - if (!skb) + if (!skb) { + kfree(hostcmd); return -ENOMEM; + } err = nla_put(skb, MWIFIEX_TM_ATTR_DATA, hostcmd->len, hostcmd->cmd); if (err) { + kfree(hostcmd); kfree_skb(skb); return -EMSGSIZE; } -- 2.20.1