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

Commit cee00a95 authored by Jouni Malinen's avatar Jouni Malinen Committed by Johannes Berg
Browse files

cfg80211: Allow use_mfp to be specified with the connect command 



The NL80211_ATTR_USE_MFP attribute was originally added for
NL80211_CMD_ASSOCIATE, but it is actually as useful (if not even more
useful) with NL80211_CMD_CONNECT, so process that attribute with the
connect command, too.

Signed-off-by: default avatarJouni Malinen <jouni@qca.qualcomm.com>
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent 1c18f145

include/net/cfg80211.h

+2 −0
Original line number Diff line number Diff line
@@ -1465,6 +1465,7 @@ struct cfg80211_ibss_params { 
 * @ie: IEs for association request

 * @ie_len: Length of assoc_ie in octets

 * @privacy: indicates whether privacy-enabled APs should be used

 * @mfp: indicate whether management frame protection is used

 * @crypto: crypto settings

 * @key_len: length of WEP key for shared key authentication

 * @key_idx: index of WEP key for shared key authentication
@@ -1485,6 +1486,7 @@ struct cfg80211_connect_params { 
	u8 *ie;

	size_t ie_len;

	bool privacy;

	enum nl80211_mfp mfp;

	struct cfg80211_crypto_settings crypto;

	const u8 *key;

	u8 key_len, key_idx;

include/uapi/linux/nl80211.h

+3 −3
Original line number Diff line number Diff line
@@ -374,8 +374,8 @@ 
 *	requests to connect to a specified network but without separating

 *	auth and assoc steps. For this, you need to specify the SSID in a

 *	%NL80211_ATTR_SSID attribute, and can optionally specify the association

 *	IEs in %NL80211_ATTR_IE, %NL80211_ATTR_AUTH_TYPE, %NL80211_ATTR_MAC,

 *	%NL80211_ATTR_WIPHY_FREQ, %NL80211_ATTR_CONTROL_PORT,

 *	IEs in %NL80211_ATTR_IE, %NL80211_ATTR_AUTH_TYPE, %NL80211_ATTR_USE_MFP,

 *	%NL80211_ATTR_MAC, %NL80211_ATTR_WIPHY_FREQ, %NL80211_ATTR_CONTROL_PORT,

 *	%NL80211_ATTR_CONTROL_PORT_ETHERTYPE and

 *	%NL80211_ATTR_CONTROL_PORT_NO_ENCRYPT.

 *	Background scan period can optionally be
@@ -958,7 +958,7 @@ enum nl80211_commands { 
 * @NL80211_ATTR_USE_MFP: Whether management frame protection (IEEE 802.11w) is

 *	used for the association (&enum nl80211_mfp, represented as a u32);

 *	this attribute can be used

 *	with %NL80211_CMD_ASSOCIATE request

 *	with %NL80211_CMD_ASSOCIATE and %NL80211_CMD_CONNECT requests

 *

 * @NL80211_ATTR_STA_FLAGS2: Attribute containing a

 *	&struct nl80211_sta_flag_update.

net/wireless/nl80211.c

+9 −0
Original line number Diff line number Diff line
@@ -5932,6 +5932,15 @@ static int nl80211_connect(struct sk_buff *skb, struct genl_info *info) 
		connect.ie_len = nla_len(info->attrs[NL80211_ATTR_IE]);

	}



	if (info->attrs[NL80211_ATTR_USE_MFP]) {

		connect.mfp = nla_get_u32(info->attrs[NL80211_ATTR_USE_MFP]);

		if (connect.mfp != NL80211_MFP_REQUIRED &&

		    connect.mfp != NL80211_MFP_NO)

			return -EINVAL;

	} else {

		connect.mfp = NL80211_MFP_NO;

	}



	if (info->attrs[NL80211_ATTR_WIPHY_FREQ]) {

		connect.channel =

			ieee80211_get_channel(wiphy,

net/wireless/sme.c

+2 −1
Original line number Diff line number Diff line
@@ -192,7 +192,8 @@ static int cfg80211_conn_do_work(struct wireless_dev *wdev) 
					    prev_bssid,

					    params->ssid, params->ssid_len,

					    params->ie, params->ie_len,

					    false, &params->crypto,

					    params->mfp != NL80211_MFP_NO,

					    &params->crypto,

					    params->flags, &params->ht_capa,

					    &params->ht_capa_mask);

		if (err)