]> Pileus Git - ~andy/linux/commitdiff
mac80211: unlock on error path in ieee80211_ibss_join()
authorDan Carpenter <dan.carpenter@oracle.com>
Thu, 8 Dec 2011 06:49:03 +0000 (09:49 +0300)
committerJohn W. Linville <linville@tuxdriver.com>
Tue, 13 Dec 2011 20:30:25 +0000 (15:30 -0500)
We recently introduced a new return here but it needs an unlock first.

Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
net/mac80211/ibss.c

index 3f830ac159e519f7fde25db5d51c4ff344f813ce..0fc9752faceab5980ae23a11cdad1bd42f634a06 100644 (file)
@@ -993,8 +993,10 @@ int ieee80211_ibss_join(struct ieee80211_sub_if_data *sdata,
        if (params->channel_fixed) {
                sdata->local->oper_channel = params->channel;
                if (!ieee80211_set_channel_type(sdata->local, sdata,
-                                              params->channel_type))
+                                              params->channel_type)) {
+                       mutex_unlock(&sdata->u.ibss.mtx);
                        return -EINVAL;
+               }
        }
 
        if (params->ie) {