iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mac80211: properly handle A-MSDUs that start with an RFC 1042 header

Browse Source 
commit a1d5ff5651 upstream.

Properly parse A-MSDUs whose first 6 bytes happen to equal a rfc1042
header. This can occur in practice when the destination MAC address
equals AA:AA:03:00:00:00. More importantly, this simplifies the next
patch to mitigate A-MSDU injection attacks.

Cc: stable@vger.kernel.org
Signed-off-by: Mathy Vanhoef <Mathy.Vanhoef@kuleuven.be>
Link: https://lore.kernel.org/r/20210511200110.0b2b886492f0.I23dd5d685fe16d3b0ec8106e8f01b59f499dffed@changeid
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Mathy Vanhoef
2021-05-11 20:02:44 +02:00
committed by Greg Kroah-Hartman
parent 42d98e0219
commit e3561d5af0
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/net/cfg80211.h
View File

@ -5624,7 +5624,7 @@ unsigned int ieee80211_get_mesh_hdrlen(struct ieee80211s_hdr *meshhdr);
*/ */
int ieee80211_data_to_8023_exthdr(struct sk_buff *skb, struct ethhdr *ehdr, int ieee80211_data_to_8023_exthdr(struct sk_buff *skb, struct ethhdr *ehdr,
const u8 *addr, enum nl80211_iftype iftype, const u8 *addr, enum nl80211_iftype iftype,
u8 data_offset); u8 data_offset, bool is_amsdu);
/** /**
* ieee80211_data_to_8023 - convert an 802.11 data frame to 802.3 * ieee80211_data_to_8023 - convert an 802.11 data frame to 802.3
@ -5636,7 +5636,7 @@ int ieee80211_data_to_8023_exthdr(struct sk_buff *skb, struct ethhdr *ehdr,
static inline int ieee80211_data_to_8023(struct sk_buff *skb, const u8 *addr, static inline int ieee80211_data_to_8023(struct sk_buff *skb, const u8 *addr,
enum nl80211_iftype iftype) enum nl80211_iftype iftype)
{ {
return ieee80211_data_to_8023_exthdr(skb, NULL, addr, iftype, 0); return ieee80211_data_to_8023_exthdr(skb, NULL, addr, iftype, 0, false);
} }
/** /**

2
net/mac80211/rx.c
View File

@ -2692,7 +2692,7 @@ __ieee80211_rx_h_amsdu(struct ieee80211_rx_data *rx, u8 data_offset)
if (ieee80211_data_to_8023_exthdr(skb, &ethhdr, if (ieee80211_data_to_8023_exthdr(skb, &ethhdr,
rx->sdata->vif.addr, rx->sdata->vif.addr,
rx->sdata->vif.type, rx->sdata->vif.type,
data_offset)) data_offset, true))
return RX_DROP_UNUSABLE; return RX_DROP_UNUSABLE;
ieee80211_amsdu_to_8023s(skb, &frame_list, dev->dev_addr, ieee80211_amsdu_to_8023s(skb, &frame_list, dev->dev_addr,

4
net/wireless/util.c
View File

@ -541,7 +541,7 @@ EXPORT_SYMBOL(ieee80211_get_mesh_hdrlen);
int ieee80211_data_to_8023_exthdr(struct sk_buff *skb, struct ethhdr *ehdr, int ieee80211_data_to_8023_exthdr(struct sk_buff *skb, struct ethhdr *ehdr,
const u8 *addr, enum nl80211_iftype iftype, const u8 *addr, enum nl80211_iftype iftype,
u8 data_offset) u8 data_offset, bool is_amsdu)
{ {
struct ieee80211_hdr *hdr = (struct ieee80211_hdr *) skb->data; struct ieee80211_hdr *hdr = (struct ieee80211_hdr *) skb->data;
struct { struct {
@ -629,7 +629,7 @@ int ieee80211_data_to_8023_exthdr(struct sk_buff *skb, struct ethhdr *ehdr,
skb_copy_bits(skb, hdrlen, &payload, sizeof(payload)); skb_copy_bits(skb, hdrlen, &payload, sizeof(payload));
tmp.h_proto = payload.proto; tmp.h_proto = payload.proto;
if (likely((ether_addr_equal(payload.hdr, rfc1042_header) && if (likely((!is_amsdu && ether_addr_equal(payload.hdr, rfc1042_header) &&
tmp.h_proto != htons(ETH_P_AARP) && tmp.h_proto != htons(ETH_P_AARP) &&
tmp.h_proto != htons(ETH_P_IPX)) || tmp.h_proto != htons(ETH_P_IPX)) ||
ether_addr_equal(payload.hdr, bridge_tunnel_header))) ether_addr_equal(payload.hdr, bridge_tunnel_header)))