From: "Guy, Wey-Yi" <wey-yi.w.guy@intel.com>
To: Dan Carpenter <error27@gmail.com>
Cc: "Berg, Johannes" <johannes.berg@intel.com>,
Intel Linux Wireless <ilw@linux.intel.com>,
"John W. Linville" <linville@tuxdriver.com>,
"linux-wireless@vger.kernel.org" <linux-wireless@vger.kernel.org>,
"kernel-janitors@vger.kernel.org"
<kernel-janitors@vger.kernel.org>
Subject: Re: [patch 1/2] iwlwifi: missing unlock on error path
Date: Tue, 15 Mar 2011 09:04:17 +0000 [thread overview]
Message-ID: <1300179857.5082.213.camel@wwguy-huron> (raw)
In-Reply-To: <20110315070158.GQ2008@bicker>
On Tue, 2011-03-15 at 00:01 -0700, Dan Carpenter wrote:
> We should unlock here instead of returning -EINVAL directly.
>
> Signed-off-by: Dan Carpenter <error27@gmail.com>
> Acked-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
> diff --git a/drivers/net/wireless/iwlwifi/iwl-agn.c b/drivers/net/wireless/iwlwifi/iwl-agn.c
> index 581dc9f..321b18b 100644
> --- a/drivers/net/wireless/iwlwifi/iwl-agn.c
> +++ b/drivers/net/wireless/iwlwifi/iwl-agn.c
> @@ -3009,14 +3009,17 @@ static int iwl_mac_offchannel_tx_cancel_wait(struct ieee80211_hw *hw)
>
> mutex_lock(&priv->mutex);
>
> - if (!priv->_agn.offchan_tx_skb)
> - return -EINVAL;
> + if (!priv->_agn.offchan_tx_skb) {
> + ret = -EINVAL;
> + goto unlock;
> + }
>
> priv->_agn.offchan_tx_skb = NULL;
>
> ret = iwl_scan_cancel_timeout(priv, 200);
> if (ret)
> ret = -EIO;
> +unlock:
> mutex_unlock(&priv->mutex);
>
> return ret;
great catch
Thanks
Wey
prev parent reply other threads:[~2011-03-15 9:04 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-03-15 7:01 [patch 1/2] iwlwifi: missing unlock on error path Dan Carpenter
2011-03-15 9:04 ` Guy, Wey-Yi [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1300179857.5082.213.camel@wwguy-huron \
--to=wey-yi.w.guy@intel.com \
--cc=error27@gmail.com \
--cc=ilw@linux.intel.com \
--cc=johannes.berg@intel.com \
--cc=kernel-janitors@vger.kernel.org \
--cc=linux-wireless@vger.kernel.org \
--cc=linville@tuxdriver.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox