This is a note to let you know that I've just added the patch titled
mac80211: fix initialization of skb->cb in ieee80211_subif_start_xmit
to the 2.6.36-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
mac80211-fix-initialization-of-skb-cb-in-ieee80211_subif_start_xmit.patch
and it can be found in the queue-2.6.36 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <[email protected]> know about it.
>From 489ee9195a7de9e6bc833d639ff6b553ffdad90e Mon Sep 17 00:00:00 2001
From: Felix Fietkau <[email protected]>
Date: Sat, 18 Dec 2010 19:30:48 +0100
Subject: mac80211: fix initialization of skb->cb in ieee80211_subif_start_xmit
From: Felix Fietkau <[email protected]>
commit 489ee9195a7de9e6bc833d639ff6b553ffdad90e upstream.
The change 'mac80211: Fix BUG in pskb_expand_head when transmitting shared skbs'
added a check for copying the skb if it's shared, however the tx info variable
still points at the cb of the old skb
Signed-off-by: Felix Fietkau <[email protected]>
Acked-by: Helmut Schaa <[email protected]>
Signed-off-by: John W. Linville <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
---
net/mac80211/tx.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
--- a/net/mac80211/tx.c
+++ b/net/mac80211/tx.c
@@ -1694,7 +1694,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;
@@ -1984,6 +1984,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;
Patches currently in stable-queue which might be from [email protected] are
queue-2.6.36/ath9k-fix-bug-in-delimiter-padding-computation.patch
queue-2.6.36/mac80211-fix-initialization-of-skb-cb-in-ieee80211_subif_start_xmit.patch
queue-2.6.36/mac80211-fix-a-crash-in-ieee80211_beacon_get_tim-on-change_interface.patch
_______________________________________________
stable mailing list
[email protected]
http://linux.kernel.org/mailman/listinfo/stable
