From: Felix Fietkau <nbd@nbd.name>
Date: Fri, 7 Oct 2022 09:05:09 +0000 (+0200)
Subject: wifi: mac80211: do not drop packets smaller than the LLC-SNAP header on fast-rx
X-Git-Tag: v6.1-rc1~33^2~4^2~13
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=f5369dcf5c0a76260cd301bd5c25d59c451d62c1;hp=6b430f72b2bc14fd0ac922dda92eaa51c82e15a4;p=linux-block.git

wifi: mac80211: do not drop packets smaller than the LLC-SNAP header on fast-rx

Since STP TCN frames are only 7 bytes, the pskb_may_pull call returns an error.
Instead of dropping those packets, bump them back to the slow path for proper
processing.

Fixes: 49ddf8e6e234 ("mac80211: add fast-rx path")
Reported-by: Chad Monroe <chad.monroe@smartrg.com>
Signed-off-by: Felix Fietkau <nbd@nbd.name>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
---

diff --git a/net/mac80211/rx.c b/net/mac80211/rx.c
index bd215fe3c796..333adad47482 100644
--- a/net/mac80211/rx.c
+++ b/net/mac80211/rx.c
@@ -4708,7 +4708,7 @@ static bool ieee80211_invoke_fast_rx(struct ieee80211_rx_data *rx,
 
 	if (!(status->rx_flags & IEEE80211_RX_AMSDU)) {
 		if (!pskb_may_pull(skb, snap_offs + sizeof(*payload)))
-			goto drop;
+			return false;
 
 		payload = (void *)(skb->data + snap_offs);