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

mt76: mt7915: fix decap offload corner case with 4-addr VLAN frames

Browse Source 
With 4-address mode VLAN frames, an internal header translation step fails,
leaving behind an extra 2-byte length field that must be reomved by the driver.
Add a check for this condition to fix receiving such packets

Signed-off-by: Felix Fietkau <nbd@nbd.name>
This commit is contained in:
Felix Fietkau 2021-11-23 11:37:47 +01:00
parent 633f77b517
commit 1eeff0b4c1
1 changed files with 21 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
drivers/net/wireless/mediatek/mt76/mt7915/mac.c
View File

@ -749,10 +749,29 @@ mt7915_mac_fill_rx(struct mt7915_dev *dev, struct sk_buff *skb)
return -EINVAL; return -EINVAL;
hdr_trans = false; hdr_trans = false;
} else { } else {
int pad_start = 0;
skb_pull(skb, hdr_gap); skb_pull(skb, hdr_gap);
if (!hdr_trans && status->amsdu) { if (!hdr_trans && status->amsdu) {
memmove(skb->data + 2, skb->data, pad_start = ieee80211_get_hdrlen_from_skb(skb);
ieee80211_get_hdrlen_from_skb(skb)); } else if (hdr_trans && (rxd2 & MT_RXD2_NORMAL_HDR_TRANS_ERROR)) {
/*
* When header translation failure is indicated,
* the hardware will insert an extra 2-byte field
* containing the data length after the protocol
* type field.
*/
pad_start = 12;
if (get_unaligned_be16(skb->data + pad_start) == ETH_P_8021Q)
pad_start += 4;
if (get_unaligned_be16(skb->data + pad_start) !=
skb->len - pad_start - 2)
pad_start = 0;
}
if (pad_start) {
memmove(skb->data + 2, skb->data, pad_start);
skb_pull(skb, 2); skb_pull(skb, 2);
} }
} }