summaryrefslogtreecommitdiffstats
path: root/package/mac80211
diff options
context:
space:
mode:
authornbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2010-12-07 18:22:43 +0000
committernbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2010-12-07 18:22:43 +0000
commit5dd2f7eb57d2c8c40844e28f90753d2efc03f1e1 (patch)
treed2d878678c32aba63f3a09c4383bf1792d119a91 /package/mac80211
parent87b570ee61f1148af16b4ee5919046cea0e138b7 (diff)
ath9k: fix a null pointer deref issue
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@24312 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/mac80211')
-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 44d8df2e0..38bf6fb9f 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;
+