]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
cw1200: fix missing unlock on error in cw1200_hw_scan()
authorWei Yongjun <weiyongjun1@huawei.com>
Sat, 22 Dec 2018 10:34:54 +0000 (10:34 +0000)
committerKalle Valo <kvalo@codeaurora.org>
Thu, 10 Jan 2019 11:35:02 +0000 (13:35 +0200)
Add the missing unlock before return from function cw1200_hw_scan()
in the error handling case.

Fixes: 4f68ef64cd7f ("cw1200: Fix concurrency use-after-free bugs in cw1200_hw_scan()")
Signed-off-by: Wei Yongjun <weiyongjun1@huawei.com>
Acked-by: Jia-Ju Bai <baijiaju1990@gmail.com>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
drivers/net/wireless/st/cw1200/scan.c

index 0a9eac93dd01aa044a1f9af65568063869bfbff7..71e9b91cf15bcea42ab10ade66578a591dd65e2d 100644 (file)
@@ -84,8 +84,11 @@ int cw1200_hw_scan(struct ieee80211_hw *hw,
 
        frame.skb = ieee80211_probereq_get(hw, priv->vif->addr, NULL, 0,
                req->ie_len);
-       if (!frame.skb)
+       if (!frame.skb) {
+               mutex_unlock(&priv->conf_mutex);
+               up(&priv->scan.lock);
                return -ENOMEM;
+       }
 
        if (req->ie_len)
                skb_put_data(frame.skb, req->ie, req->ie_len);