developer | ec56711 | 2022-10-11 11:02:55 +0800 | [diff] [blame] | 1 | From: Felix Fietkau <nbd@nbd.name> |
| 2 | Date: Fri, 7 Oct 2022 10:58:26 +0200 |
| 3 | Subject: [PATCH] wifi: mac80211: do not drop packets smaller than the |
| 4 | LLC-SNAP header on fast-rx |
| 5 | |
| 6 | Since STP TCN frames are only 7 bytes, the pskb_may_pull call returns an error. |
| 7 | Instead of dropping those packets, bump them back to the slow path for proper |
| 8 | processing. |
| 9 | |
| 10 | Fixes: 49ddf8e6e234 ("mac80211: add fast-rx path") |
| 11 | Reported-by: Chad Monroe <chad.monroe@smartrg.com> |
| 12 | Signed-off-by: Felix Fietkau <nbd@nbd.name> |
| 13 | --- |
| 14 | |
| 15 | --- a/net/mac80211/rx.c |
| 16 | +++ b/net/mac80211/rx.c |
| 17 | @@ -4601,7 +4601,7 @@ static bool ieee80211_invoke_fast_rx(str |
| 18 | |
| 19 | if (!(status->rx_flags & IEEE80211_RX_AMSDU)) { |
| 20 | if (!pskb_may_pull(skb, snap_offs + sizeof(*payload))) |
| 21 | - goto drop; |
| 22 | + return false; |
| 23 | |
| 24 | payload = (void *)(skb->data + snap_offs); |
| 25 | |