From: Felix Fietkau Date: Fri, 23 Feb 2018 09:06:03 +0000 (+0100) Subject: mac80211: drop frames with unexpected DS bits from fast-rx to slow path X-Git-Tag: v4.16-rc5~37^2~8^2~1 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b323ac19b7734a1c464b2785a082ee50bccd3b91;p=thirdparty%2Fkernel%2Flinux.git mac80211: drop frames with unexpected DS bits from fast-rx to slow path Fixes rx for 4-addr packets in AP mode. These may be used for setting up a 4-addr link for stations that are allowed to do so. Signed-off-by: Felix Fietkau Signed-off-by: Johannes Berg --- diff --git a/net/mac80211/rx.c b/net/mac80211/rx.c index fd580614085b3..56fe16b075381 100644 --- a/net/mac80211/rx.c +++ b/net/mac80211/rx.c @@ -3921,7 +3921,7 @@ static bool ieee80211_invoke_fast_rx(struct ieee80211_rx_data *rx, if ((hdr->frame_control & cpu_to_le16(IEEE80211_FCTL_FROMDS | IEEE80211_FCTL_TODS)) != fast_rx->expected_ds_bits) - goto drop; + return false; /* assign the key to drop unencrypted frames (later) * and strip the IV/MIC if necessary