Commit f8b43c5c authored Aug 27, 2019 by Denis Kenzior Committed by Johannes Berg Aug 29, 2019

mac80211: Correctly set noencrypt for PAE frames



The noencrypt flag was intended to be set if the "frame was received
unencrypted" according to include/uapi/linux/nl80211.h.  However, the
current behavior is opposite of this.

Cc: stable@vger.kernel.org
Fixes: 018f6fbf ("mac80211: Send control port frames over nl80211")
Signed-off-by: Denis Kenzior <denkenz@gmail.com>
Link: https://lore.kernel.org/r/20190827224120.14545-3-denkenz@gmail.com


Signed-off-by: Johannes Berg <johannes.berg@intel.com>

parent c8a41c6a

net/mac80211/rx.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -2447,7 +2447,7 @@ static void ieee80211_deliver_skb_to_local_stack(struct sk_buff *skb,
		skb->protocol == cpu_to_be16(ETH_P_PREAUTH)) &&
		sdata->control_port_over_nl80211)) {
		struct ieee80211_rx_status *status = IEEE80211_SKB_RXCB(skb);
		bool noencrypt = status->flag & RX_FLAG_DECRYPTED;
		bool noencrypt = !(status->flag & RX_FLAG_DECRYPTED);

		cfg80211_rx_control_port(dev, skb, noencrypt);
		dev_kfree_skb(skb);

Admin message