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

Commit d0c22119 authored by Bob Copeland's avatar Bob Copeland Committed by Johannes Berg
Browse files

mac80211: drop unencrypted frames in mesh fwding 



The mesh forwarding path was not checking that data
frames were protected when running an encrypted network;
add the necessary check.

Cc: stable@vger.kernel.org
Reported-by: default avatarJohannes Berg <johannes@sipsolutions.net>
Signed-off-by: default avatarBob Copeland <me@bobcopeland.com>
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent 9c1c98a3

net/mac80211/rx.c

+3 −0
Original line number Original line Diff line number Diff line
@@ -2214,6 +2214,9 @@ ieee80211_rx_h_mesh_fwding(struct ieee80211_rx_data *rx) 
	hdr = (struct ieee80211_hdr *) skb->data;

	hdr = (struct ieee80211_hdr *) skb->data;

	mesh_hdr = (struct ieee80211s_hdr *) (skb->data + hdrlen);

	mesh_hdr = (struct ieee80211s_hdr *) (skb->data + hdrlen);





	if (ieee80211_drop_unencrypted(rx, hdr->frame_control))

		return RX_DROP_MONITOR;



	/* frame is in RMC, don't forward */

	/* frame is in RMC, don't forward */

	if (ieee80211_is_data(hdr->frame_control) &&

	if (ieee80211_is_data(hdr->frame_control) &&

	    is_multicast_ether_addr(hdr->addr1) &&

	    is_multicast_ether_addr(hdr->addr1) &&