aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2010-12-18 17:56:32 +0000
committerFelix Fietkau <nbd@openwrt.org>2010-12-18 17:56:32 +0000
commitb40d260aaf6c6cd4dab390094a706dfa409e9012 (patch)
tree64fa3ba3d1dc11e0bd0356481f02d3f0fc469f65
parent5c4d94f71489faf9db5c95016f8bacc13539c4f2 (diff)
downloadupstream-b40d260aaf6c6cd4dab390094a706dfa409e9012.tar.gz
upstream-b40d260aaf6c6cd4dab390094a706dfa409e9012.tar.bz2
upstream-b40d260aaf6c6cd4dab390094a706dfa409e9012.zip
mac80211: fix a crash in the tx path
SVN-Revision: 24672
-rw-r--r--package/mac80211/patches/541-mac80211_fix_skb_copy_crash.patch19
1 files changed, 19 insertions, 0 deletions
diff --git a/package/mac80211/patches/541-mac80211_fix_skb_copy_crash.patch b/package/mac80211/patches/541-mac80211_fix_skb_copy_crash.patch
new file mode 100644
index 0000000000..810df58506
--- /dev/null
+++ b/package/mac80211/patches/541-mac80211_fix_skb_copy_crash.patch
@@ -0,0 +1,19 @@
+--- a/net/mac80211/tx.c
++++ b/net/mac80211/tx.c
+@@ -1748,7 +1748,7 @@ netdev_tx_t ieee80211_subif_start_xmit(s
+ {
+ struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev);
+ struct ieee80211_local *local = sdata->local;
+- struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);
++ struct ieee80211_tx_info *info;
+ int ret = NETDEV_TX_BUSY, head_need;
+ u16 ethertype, hdrlen, meshhdrlen = 0;
+ __le16 fc;
+@@ -2039,6 +2039,7 @@ netdev_tx_t ieee80211_subif_start_xmit(s
+ skb_set_network_header(skb, nh_pos);
+ skb_set_transport_header(skb, h_pos);
+
++ info = IEEE80211_SKB_CB(skb);
+ memset(info, 0, sizeof(*info));
+
+ dev->trans_start = jiffies;