aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2010-12-07 18:22:43 +0000
committerFelix Fietkau <nbd@openwrt.org>2010-12-07 18:22:43 +0000
commitc8e13895282a5cbf8337361bb1e6fe110113323f (patch)
treef281b24762161bdac5a11b4b2e53b6b28b55f7c9
parentf8ed133c0a816ace12bdd11cb3eb3fed168f1186 (diff)
downloadupstream-c8e13895282a5cbf8337361bb1e6fe110113323f.tar.gz
upstream-c8e13895282a5cbf8337361bb1e6fe110113323f.tar.bz2
upstream-c8e13895282a5cbf8337361bb1e6fe110113323f.zip
ath9k: fix a null pointer deref issue
SVN-Revision: 24312
-rw-r--r--package/mac80211/patches/320-pending_work.patch14
1 files changed, 14 insertions, 0 deletions
diff --git a/package/mac80211/patches/320-pending_work.patch b/package/mac80211/patches/320-pending_work.patch
index 44d8df2e03..38bf6fb9fb 100644
--- a/package/mac80211/patches/320-pending_work.patch
+++ b/package/mac80211/patches/320-pending_work.patch
@@ -2137,3 +2137,17 @@
}
/* add interfaces */
+--- a/drivers/net/wireless/ath/ath9k/xmit.c
++++ b/drivers/net/wireless/ath/ath9k/xmit.c
+@@ -1745,7 +1745,10 @@ int ath_tx_start(struct ieee80211_hw *hw
+ int frmlen = skb->len + FCS_LEN;
+ int q;
+
+- txctl->an = (struct ath_node *)sta->drv_priv;
++ /* NOTE: sta can be NULL according to net/mac80211.h */
++ if (sta)
++ txctl->an = (struct ath_node *)sta->drv_priv;
++
+ if (info->control.hw_key)
+ frmlen += info->control.hw_key->icv_len;
+