From: nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Tue, 7 Dec 2010 18:22:43 +0000 (+0000)
Subject: ath9k: fix a null pointer deref issue
X-Git-Url: http://git.rohieb.name/openwrt.git/commitdiff_plain/5dd2f7eb57d2c8c40844e28f90753d2efc03f1e1

ath9k: fix a null pointer deref issue

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@24312 3c298f89-4303-0410-b956-a3cf2f4a3e73
---

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;
+