From patchwork Sat Jan 2 09:31:42 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lennert Buytenhek X-Patchwork-Id: 70472 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.3/8.14.2) with ESMTP id o029Vpcu004935 for ; Sat, 2 Jan 2010 09:31:51 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752569Ab0ABJbp (ORCPT ); Sat, 2 Jan 2010 04:31:45 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752545Ab0ABJbo (ORCPT ); Sat, 2 Jan 2010 04:31:44 -0500 Received: from fw.wantstofly.org ([80.101.37.227]:49876 "EHLO mail.wantstofly.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752508Ab0ABJbo (ORCPT ); Sat, 2 Jan 2010 04:31:44 -0500 Received: by mail.wantstofly.org (Postfix, from userid 500) id 7EF8F18E1F0; Sat, 2 Jan 2010 10:31:42 +0100 (CET) Date: Sat, 2 Jan 2010 10:31:42 +0100 From: Lennert Buytenhek To: linville@tuxdriver.com Cc: linux-wireless@vger.kernel.org Subject: [PATCH 1/2] mwl8k: fix configure_filter() memory leak on error Message-ID: <20100102093142.GS1735@mail.wantstofly.org> Mime-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.4.2.2i Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org diff --git a/drivers/net/wireless/mwl8k.c b/drivers/net/wireless/mwl8k.c index 59d4915..59f9210 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);