From: Lennert Buytenhek <buytenh@wantstofly.org>
Date: Sat, 2 Jan 2010 09:31:42 +0000 (+0100)
Subject: mwl8k: fix configure_filter() memory leak on error
X-Git-Tag: MMI-PSA29.97-13-9~24911^2~1^2~43
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=90852f7aed0f90d443efd7e0f9b82d8ac8186848;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

mwl8k: fix configure_filter() memory leak on error

If there was an error acquiring the firmware lock in
mwl8k_configure_filter(), we would end up leaking the multicast
command packet prepared by mwl8k_prepare_multicast().

Signed-off-by: Lennert Buytenhek <buytenh@marvell.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
---

diff --git a/drivers/net/wireless/mwl8k.c b/drivers/net/wireless/mwl8k.c
index 59d49159cf2a..59f92105b0c2 100644
--- a/drivers/net/wireless/mwl8k.c
+++ b/drivers/net/wireless/mwl8k.c
@@ -3157,8 +3157,10 @@ static void mwl8k_configure_filter(struct ieee80211_hw *hw,
 	/* Clear unsupported feature flags */
 	*total_flags &= FIF_ALLMULTI | FIF_BCN_PRBRESP_PROMISC;
 
-	if (mwl8k_fw_lock(hw))
+	if (mwl8k_fw_lock(hw)) {
+		kfree(cmd);
 		return;
+	}
 
 	if (priv->sniffer_enabled) {
 		mwl8k_enable_sniffer(hw, 0);