summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2010-10-31 15:31:54 +0100
committerJohn W. Linville <linville@tuxdriver.com>2010-11-08 16:53:47 -0500
commit3cc25e510dfc36dc62ee0aa87344b36ed7c1742a (patch)
treeaa485987c383ac5c2843e1f3d7b3eb3a628f111b /net
parent8df86db9060ddd123d172c7adb6b2b71f31e77cd (diff)
downloadlinux-3cc25e510dfc36dc62ee0aa87344b36ed7c1742a.tar.gz
linux-3cc25e510dfc36dc62ee0aa87344b36ed7c1742a.tar.bz2
linux-3cc25e510dfc36dc62ee0aa87344b36ed7c1742a.zip
cfg80211: fix a crash in dev lookup on dump commands
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>
Diffstat (limited to 'net')
-rw-r--r--net/wireless/nl80211.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c
index c506241f8637..4e78e3f26798 100644
--- a/net/wireless/nl80211.c
+++ b/net/wireless/nl80211.c
@@ -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;
}