Home » Mailing list archives » linux-kernel » 2007 » November » 15

[patch 17/23] ieee80211: fix TKIP QoS bug

!MAILaRCHIVE_VOTE_RePLACE
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
[view in full thread]
From: Greg KH <gregkh@...>
To: <linux-kernel@...>, <stable@...>
Cc: Justin Forbes <jmforbes@...>, Zwane Mwaikambo <zwane@...>, Theodore Ts'o <tytso@...>, Randy Dunlap <rdunlap@...>, Dave Jones <davej@...>, Chuck Wolber <chuckw@...>, Chris Wedgwood <reviews@...>, Michael Krufky <mkrufky@...>, Chuck Ebbert <cebbert@...>, Domenico Andreoli <cavokz@...>, <torvalds@...>, <akpm@...>, <alan@...>, Johannes Berg <johannes@...>, <linux-wireless@...>, John W. Linville <linville@...>
Subject: [patch 17/23] ieee80211: fix TKIP QoS bug
Date: Thursday, November 15, 2007 - 2:20 am

-stable review patch.  If anyone has any objections, please let us know.

------------------


From: Johannes Berg <johannes@sipsolutions.net>

patch e797aa1b7da6bfcb2e19a10ae5ead9aa7aea732b in mainline.

The commit 65b6a277 titled "ieee80211: Fix header->qos_ctl endian issue"
*introduced* an endianness bug. Partially revert it.

Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

---
 net/ieee80211/ieee80211_crypt_tkip.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- a/net/ieee80211/ieee80211_crypt_tkip.c
+++ b/net/ieee80211/ieee80211_crypt_tkip.c
@@ -584,7 +584,7 @@ static void michael_mic_hdr(struct sk_bu
 	if (stype & IEEE80211_STYPE_QOS_DATA) {
 		const struct ieee80211_hdr_3addrqos *qoshdr =
 			(struct ieee80211_hdr_3addrqos *)skb->data;
-		hdr[12] = qoshdr->qos_ctl & cpu_to_le16(IEEE80211_QCTL_TID);
+		hdr[12] = le16_to_cpu(qoshdr->qos_ctl) & IEEE80211_QCTL_TID;
 	} else
 		hdr[12] = 0;		/* priority */
 

-- 
-
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
Messages in current thread:
[patch 00/23] 2.6.23-stable review, network changes, Greg KH, (Thu Nov 15, 2:18 am)
[patch 22/23] mac80211: only honor IW_SCAN_THIS_ESSID in STA..., Greg KH, (Thu Nov 15, 2:21 am)
[patch 23/23] mac80211: make ieee802_11_parse_elems return v..., Greg KH, (Thu Nov 15, 2:21 am)
[patch 20/23] mac80211: store SSID in sta_bss_list, Greg KH, (Thu Nov 15, 2:21 am)
[patch 19/23] mac80211: store channel info in sta_bss_list, Greg KH, (Thu Nov 15, 2:21 am)
[patch 21/23] mac80211: honor IW_SCAN_THIS_ESSID in siwscan ..., Greg KH, (Thu Nov 15, 2:21 am)
[patch 16/23] NETFILTER: nf_conntrack_tcp: fix connection re..., Greg KH, (Thu Nov 15, 2:20 am)
[patch 17/23] ieee80211: fix TKIP QoS bug, Greg KH, (Thu Nov 15, 2:20 am)
[patch 18/23] mac80211: reorder association debug output, Greg KH, (Thu Nov 15, 2:21 am)
[patch 15/23] Fix netlink timeouts., Greg KH, (Thu Nov 15, 2:20 am)
[patch 14/23] Fix crypto_alloc_comp() error checking., Greg KH, (Thu Nov 15, 2:20 am)
[patch 08/23] softmac: fix wext MLME request reason code end..., Greg KH, (Thu Nov 15, 2:20 am)
[patch 13/23] Fix SET_VLAN_INGRESS_PRIORITY_CMD error return., Greg KH, (Thu Nov 15, 2:20 am)
[patch 11/23] Fix endianness bug in U32 classifier., Greg KH, (Thu Nov 15, 2:20 am)
[patch 12/23] Fix VLAN address syncing., Greg KH, (Thu Nov 15, 2:20 am)
[patch 10/23] Fix TEQL oops., Greg KH, (Thu Nov 15, 2:20 am)
[patch 09/23] Fix error returns in sys_socketpair(), Greg KH, (Thu Nov 15, 2:20 am)
[patch 07/23] Fix kernel_accept() return handling., Greg KH, (Thu Nov 15, 2:20 am)
[patch 05/23] Fix 9P protocol build, Greg KH, (Thu Nov 15, 2:20 am)
[patch 06/23] Fix SKB_WITH_OVERHEAD calculations., Greg KH, (Thu Nov 15, 2:20 am)
Re: [patch 06/23] Fix SKB_WITH_OVERHEAD calculations., Herbert Xu, (Thu Nov 15, 2:29 am)
Re: [patch 06/23] Fix SKB_WITH_OVERHEAD calculations., David Miller, (Thu Nov 15, 3:00 am)
Re: [patch 06/23] Fix SKB_WITH_OVERHEAD calculations., Herbert Xu, (Thu Nov 15, 3:31 am)
Re: [stable] [patch 06/23] Fix SKB_WITH_OVERHEAD calculations., Greg KH, (Thu Nov 15, 8:31 pm)
Re: [stable] [patch 06/23] Fix SKB_WITH_OVERHEAD calculations., David Miller, (Thu Nov 15, 10:42 pm)
[patch 04/23] Fix advertised packet scheduler timer resolution, Greg KH, (Thu Nov 15, 2:20 am)
[patch 03/23] Add get_unaligned to ieee80211_get_radiotap_len, Greg KH, (Thu Nov 15, 2:20 am)
[patch 02/23] mac80211: Improve sanity checks on injected pa..., Greg KH, (Thu Nov 15, 2:20 am)
[patch 01/23] mac80211: filter locally-originated multicast ..., Greg KH, (Thu Nov 15, 2:20 am)