aboutsummaryrefslogtreecommitdiffstats
path: root/net/mac80211/tx.c
diff options
context:
space:
mode:
authorLuis R. Rodriguez <lrodriguez@atheros.com>2009-07-24 19:57:25 -0400
committerJohn W. Linville <linville@tuxdriver.com>2009-07-27 15:24:19 -0400
commit21f5fc75deca63bc41c9d13007d35981d4485622 (patch)
tree13b451930a6ff36ae651e52e5c359ea4387a7ea4 /net/mac80211/tx.c
parentac88b6ecdfa629fd1261dab1504d78a56fd4cabf (diff)
mac80211: fix oops due to missing private data
This was caused by patch: "mac80211: cooperate more with network namespaces" The version of the patch applied doesn't match Johannes' latest: http://johannes.sipsolutions.net/patches/kernel/all/LATEST/NNN-mac80211-netns.patch The skb->cb virtual interface data wasn't being reset for reuse so ath9k pooped out when trying to dereference the private rate control info from the skb. BUG: unable to handle kernel NULL pointer dereference RIP: 0010:[<ffffffffa0258173>] ath_tx_rc_status+0x33/0x150 [ath9k] <-- snip etc --> Reported-by: Davide Pesavento <davidepesa@gmail.com> Signed-off-by: Luis R. Rodriguez <lrodriguez@atheros.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/mac80211/tx.c')
-rw-r--r--net/mac80211/tx.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c
index edacad1fb1dc..9e5dff1c8f27 100644
--- a/net/mac80211/tx.c
+++ b/net/mac80211/tx.c
@@ -1170,13 +1170,15 @@ static int __ieee80211_tx(struct ieee80211_local *local,
1170 } 1170 }
1171 1171
1172 ret = drv_tx(local, skb); 1172 ret = drv_tx(local, skb);
1173 info->control.vif = &sdata->vif;
1174 if (WARN_ON(ret != NETDEV_TX_OK && skb->len != len)) { 1173 if (WARN_ON(ret != NETDEV_TX_OK && skb->len != len)) {
1175 dev_kfree_skb(skb); 1174 dev_kfree_skb(skb);
1176 ret = NETDEV_TX_OK; 1175 ret = NETDEV_TX_OK;
1177 } 1176 }
1178 if (ret != NETDEV_TX_OK) 1177 if (ret != NETDEV_TX_OK) {
1178 info->control.vif = &sdata->vif;
1179 return IEEE80211_TX_AGAIN; 1179 return IEEE80211_TX_AGAIN;
1180 }
1181
1180 *skbp = skb = next; 1182 *skbp = skb = next;
1181 ieee80211_led_tx(local, 1); 1183 ieee80211_led_tx(local, 1);
1182 fragm = true; 1184 fragm = true;