diff options
| author | Felix Fietkau <nbd@nbd.name> | 2023-02-13 13:08:51 +0300 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2023-02-14 14:25:01 +0300 |
| commit | 0f690e6b4dcd7243e2805a76981b252c2d4bdce6 (patch) | |
| tree | d085f8e913c551881551f9cde6a87657b8c588a5 /net/wireless | |
| parent | 59336e07b287d91dc4ec265e07724e8f7e3d0209 (diff) | |
| download | linux-0f690e6b4dcd7243e2805a76981b252c2d4bdce6.tar.xz | |
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: Felix Fietkau <nbd@nbd.name>
Link: https://lore.kernel.org/r/20230213100855.34315-1-nbd@nbd.name
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net/wireless')
| -rw-r--r-- | net/wireless/util.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/net/wireless/util.c b/net/wireless/util.c index 38d3b434c18c..430962f97e74 100644 --- a/net/wireless/util.c +++ b/net/wireless/util.c @@ -631,8 +631,9 @@ int ieee80211_data_to_8023_exthdr(struct sk_buff *skb, struct ethhdr *ehdr, break; } - if (likely(skb_copy_bits(skb, hdrlen, &payload, sizeof(payload)) == 0 && - ((!is_amsdu && ether_addr_equal(payload.hdr, rfc1042_header) && + if (likely(!is_amsdu && + 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_IPX)) || ether_addr_equal(payload.hdr, bridge_tunnel_header)))) { |