summaryrefslogtreecommitdiffstats
path: root/net/mac80211
diff options
context:
space:
mode:
authorJohn W. Linville <linville@tuxdriver.com>2007-05-15 22:14:40 +0200
committerJohn W. Linville <linville@tuxdriver.com>2007-05-29 16:34:05 +0200
commit91fa558ba28b0014205f2c1a75b1cceb4298aa04 (patch)
treeb10a12a30eaaf72ecc1ff3d8de95be5eacd4e1d4 /net/mac80211
parent[PATCH] mac80211: always set carrier status on open (diff)
downloadlinux-91fa558ba28b0014205f2c1a75b1cceb4298aa04.tar.xz
linux-91fa558ba28b0014205f2c1a75b1cceb4298aa04.zip
[PATCH] mac80211: avoid null ptr deref in ieee80211_ibss_add_sta
avoid sdata null pointer dereference in ieee80211_ibss_add_sta. Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/mac80211')
-rw-r--r--net/mac80211/ieee80211_sta.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/mac80211/ieee80211_sta.c b/net/mac80211/ieee80211_sta.c
index dbac8583f394..9f30ae4c2ab3 100644
--- a/net/mac80211/ieee80211_sta.c
+++ b/net/mac80211/ieee80211_sta.c
@@ -2997,7 +2997,7 @@ struct sta_info * ieee80211_ibss_add_sta(struct net_device *dev,
{
struct ieee80211_local *local = wdev_priv(dev->ieee80211_ptr);
struct sta_info *sta;
- struct ieee80211_sub_if_data *sdata = NULL;
+ struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev);
/* TODO: Could consider removing the least recently used entry and
* allow new one to be added. */