Commit 0f690e6b authored by Felix Fietkau's avatar Felix Fietkau Committed by Johannes Berg

wifi: cfg80211: move A-MSDU check in ieee80211_data_to_8023_exthdr

When parsing the outer A-MSDU header, don't check for inner bridge tunnel
or RFC1042 headers. This is handled by ieee80211_amsdu_to_8023s already.
Signed-off-by: default avatarFelix Fietkau <nbd@nbd.name>
Link: https://lore.kernel.org/r/20230213100855.34315-1-nbd@nbd.nameSigned-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent 59336e07
...@@ -631,8 +631,9 @@ int ieee80211_data_to_8023_exthdr(struct sk_buff *skb, struct ethhdr *ehdr, ...@@ -631,8 +631,9 @@ int ieee80211_data_to_8023_exthdr(struct sk_buff *skb, struct ethhdr *ehdr,
break; break;
} }
if (likely(skb_copy_bits(skb, hdrlen, &payload, sizeof(payload)) == 0 && if (likely(!is_amsdu &&
((!is_amsdu && ether_addr_equal(payload.hdr, rfc1042_header) && skb_copy_bits(skb, hdrlen, &payload, sizeof(payload)) == 0 &&
((ether_addr_equal(payload.hdr, rfc1042_header) &&
payload.proto != htons(ETH_P_AARP) && payload.proto != htons(ETH_P_AARP) &&
payload.proto != htons(ETH_P_IPX)) || payload.proto != htons(ETH_P_IPX)) ||
ether_addr_equal(payload.hdr, bridge_tunnel_header)))) { ether_addr_equal(payload.hdr, bridge_tunnel_header)))) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment