]> bbs.cooldavid.org Git - net-next-2.6.git/commitdiff
cfg80211: fix a crash in dev lookup on dump commands
authorFelix Fietkau <nbd@openwrt.org>
Sun, 31 Oct 2010 14:31:54 +0000 (15:31 +0100)
committerJohn W. Linville <linville@tuxdriver.com>
Mon, 8 Nov 2010 21:53:47 +0000 (16:53 -0500)
IS_ERR and PTR_ERR were called with the wrong pointer, leading to a
crash when cfg80211_get_dev_from_ifindex fails.

Signed-off-by: Felix Fietkau <nbd@openwrt.org>
Acked-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
net/wireless/nl80211.c

index c506241f863706426e76d66736d0258eda34d769..4e78e3f26798378bad69630679565b1909bfb370 100644 (file)
@@ -224,8 +224,8 @@ static int nl80211_prepare_netdev_dump(struct sk_buff *skb,
        }
 
        *rdev = cfg80211_get_dev_from_ifindex(sock_net(skb->sk), ifidx);
-       if (IS_ERR(dev)) {
-               err = PTR_ERR(dev);
+       if (IS_ERR(*rdev)) {
+               err = PTR_ERR(*rdev);
                goto out_rtnl;
        }