]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
nl80211: Fix exit from nl80211_set_power_save
authorTeemu Paasikivi <ext-teemu.3.paasikivi@nokia.com>
Fri, 24 Sep 2010 04:23:55 +0000 (07:23 +0300)
committerJohn W. Linville <linville@tuxdriver.com>
Mon, 27 Sep 2010 19:57:47 +0000 (15:57 -0400)
If interface does not existk, when nl80211_set_power_save is called, (eg.
module has been unloaded) it has been causing kernel panic. Added new
goto target to avoid crash if get_rdev_dev_by_info_ifindex does not
return dev and rdev pointers.

Signed-off-by: Teemu Paasikivi <ext-teemu.3.paasikivi@nokia.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
net/wireless/nl80211.c

index f15b1af2c768ca8007902b045e998456d38d595a..4ff827e8c362c51d8d2927b7160f5b0b741f27ac 100644 (file)
@@ -4990,7 +4990,7 @@ static int nl80211_set_power_save(struct sk_buff *skb, struct genl_info *info)
 
        err = get_rdev_dev_by_info_ifindex(info, &rdev, &dev);
        if (err)
-               goto unlock_rdev;
+               goto unlock_rtnl;
 
        wdev = dev->ieee80211_ptr;
 
@@ -5014,6 +5014,7 @@ static int nl80211_set_power_save(struct sk_buff *skb, struct genl_info *info)
 unlock_rdev:
        cfg80211_unlock_rdev(rdev);
        dev_put(dev);
+unlock_rtnl:
        rtnl_unlock();
 
 out: