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

Commit 5cff5e01 authored by Javier Cardona's avatar Javier Cardona Committed by John W. Linville
Browse files

mac80211: ignore peers if security is enabled for this mesh 



Signed-off-by: default avatarJavier Cardona <javier@cozybit.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 15d5dda6

net/mac80211/cfg.c

+1 −0
Original line number Diff line number Diff line
@@ -1053,6 +1053,7 @@ static int copy_mesh_setup(struct ieee80211_if_mesh *ifmsh, 
	memcpy(ifmsh->mesh_id, setup->mesh_id, ifmsh->mesh_id_len);

	ifmsh->mesh_pp_id = setup->path_sel_proto;

	ifmsh->mesh_pm_id = setup->path_metric;

	ifmsh->is_secure = setup->is_secure;



	return 0;

}

net/mac80211/ieee80211_i.h

+1 −0
Original line number Diff line number Diff line
@@ -490,6 +490,7 @@ struct ieee80211_if_mesh { 
	bool accepting_plinks;

	const u8 *ie;

	u8 ie_len;

	bool is_secure;

};



#ifdef CONFIG_MAC80211_MESH

net/mac80211/mesh.c

+4 −0
Original line number Diff line number Diff line
@@ -573,6 +573,10 @@ static void ieee80211_mesh_rx_bcn_presp(struct ieee80211_sub_if_data *sdata, 
	ieee802_11_parse_elems(mgmt->u.probe_resp.variable, len - baselen,

			       &elems);



	/* ignore beacons from secure mesh peers if our security is off */

	if (elems.rsn_len && !sdata->u.mesh.is_secure)

		return;



	if (elems.ds_params && elems.ds_params_len == 1)

		freq = ieee80211_channel_to_frequency(elems.ds_params[0], band);

	else

net/mac80211/mesh_plink.c

+4 −0
Original line number Diff line number Diff line
@@ -449,6 +449,10 @@ void mesh_rx_plink_frame(struct ieee80211_sub_if_data *sdata, struct ieee80211_m 
		mpl_dbg("Mesh plink: missing necessary peer link ie\n");

		return;

	}

	if (elems.rsn_len && !sdata->u.mesh.is_secure) {

		mpl_dbg("Mesh plink: can't establish link with secure peer\n");

		return;

	}



	ftype = mgmt->u.action.u.plink_action.action_code;

	ie_len = elems.peer_link_len;

net/wireless/mesh.c

+1 −0
Original line number Diff line number Diff line
@@ -55,6 +55,7 @@ const struct mesh_setup default_mesh_setup = { 
	.path_metric = IEEE80211_PATH_METRIC_AIRTIME,

	.ie = NULL,

	.ie_len = 0,

	.is_secure = false,

};



int __cfg80211_join_mesh(struct cfg80211_registered_device *rdev,