Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b2898a27 authored by Ivo van Doorn's avatar Ivo van Doorn Committed by John W. Linville
Browse files

mac80211: Don't request encryption for probe response 



Probe responses shouldn't be encrypted, and mac80211 doesn't
set the crypto key accordingly. However it didn't set the
IEEE80211_TX_CTL_DO_NOT_ENCRYPT flag which means drivers
could make an attempt to encrypt it, and causing a NULL
pointer dereference when accessing the provided hw_key field.

Signed-off-by: default avatarIvo van Doorn <IvDoorn@gmail.com>
Acked-by: default avatarJohannes Berg <johannes@sipsolutions.net>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 8fa7425c

net/mac80211/mlme.c

+1 −0
Original line number Diff line number Diff line
@@ -2481,6 +2481,7 @@ static int ieee80211_sta_join_ibss(struct net_device *dev, 
			control->flags |= IEEE80211_TX_CTL_SHORT_PREAMBLE;

		control->antenna_sel_tx = local->hw.conf.antenna_sel_tx;

		control->flags |= IEEE80211_TX_CTL_NO_ACK;

		control->flags |= IEEE80211_TX_CTL_DO_NOT_ENCRYPT;

		control->control.retry_limit = 1;



		ifsta->probe_resp = skb_copy(skb, GFP_ATOMIC);