Merge "cfg80211: Add macros to indicate backport support for FILS" (1e40e6c3) · Commits · e / devices / android_kernel_oneplus_sm8150

include/net/cfg80211.h

+17 −1

Original line number	Diff line number	Diff line
		@@ -32,6 +32,15 @@
		/* Indicate backport support for external authentication*/
		#define CFG80211_EXTERNAL_AUTH_SUPPORT 1

		/* Indicate support for including KEK length in rekey data */
		#define CFG80211_REKEY_DATA_KEK_LEN 1

		/* Indicate backport support for the new connect done api */
		#define CFG80211_CONNECT_DONE 1

		/* Indicate backport support for FILS SK offload in cfg80211 */
		#define CFG80211_FILS_SK_OFFLOAD_SUPPORT 1

		/**
		* DOC: Introduction
		*
		@@ -2179,9 +2188,14 @@ struct cfg80211_connect_params {
		* have to be updated as part of update_connect_params() call.
		*
		* @UPDATE_ASSOC_IES: Indicates whether association request IEs are updated
		* @UPDATE_FILS_ERP_INFO: Indicates that FILS connection parameters (realm,
		* username, erp sequence number and rrk) are updated
		* @UPDATE_AUTH_TYPE: Indicates that Authentication type is updated
		*/
		enum cfg80211_connect_params_changed {
		UPDATE_ASSOC_IES = BIT(0),
		UPDATE_FILS_ERP_INFO = BIT(1),
		UPDATE_AUTH_TYPE = BIT(2),
		};

		/**
		@@ -2403,12 +2417,14 @@ struct cfg80211_wowlan_wakeup {

		/**
		* struct cfg80211_gtk_rekey_data - rekey data
		* @kek: key encryption key (NL80211_KEK_LEN bytes)
		* @kek: key encryption key
		* @kck: key confirmation key (NL80211_KCK_LEN bytes)
		* @replay_ctr: replay counter (NL80211_REPLAY_CTR_LEN bytes)
		* @kek_len: Length of @kek in octets
		*/
		struct cfg80211_gtk_rekey_data {
		const u8 kek, kck, *replay_ctr;
		size_t kek_len;
		};

		/**

net/wireless/nl80211.c

+56 −4

Original line number	Diff line number	Diff line
		@@ -490,7 +490,8 @@ nl80211_coalesce_policy[NUM_NL80211_ATTR_COALESCE_RULE] = {
		/* policy for GTK rekey offload attributes */
		static const struct nla_policy
		nl80211_rekey_policy[NUM_NL80211_REKEY_DATA] = {
		[NL80211_REKEY_DATA_KEK] = { .len = NL80211_KEK_LEN },
		[NL80211_REKEY_DATA_KEK] = { .type = NLA_BINARY,
		.len = FILS_MAX_KEK_LEN },
		[NL80211_REKEY_DATA_KCK] = { .len = NL80211_KCK_LEN },
		[NL80211_REKEY_DATA_REPLAY_CTR] = { .len = NL80211_REPLAY_CTR_LEN },
		};
		@@ -9158,6 +9159,45 @@ static int nl80211_update_connect_params(struct sk_buff *skb,
		changed \|= UPDATE_ASSOC_IES;
		}

		if (wiphy_ext_feature_isset(&rdev->wiphy,
		NL80211_EXT_FEATURE_FILS_SK_OFFLOAD) &&
		info->attrs[NL80211_ATTR_FILS_ERP_USERNAME] &&
		info->attrs[NL80211_ATTR_FILS_ERP_REALM] &&
		info->attrs[NL80211_ATTR_FILS_ERP_NEXT_SEQ_NUM] &&
		info->attrs[NL80211_ATTR_FILS_ERP_RRK]) {
		connect.fils_erp_username =
		nla_data(info->attrs[NL80211_ATTR_FILS_ERP_USERNAME]);
		connect.fils_erp_username_len =
		nla_len(info->attrs[NL80211_ATTR_FILS_ERP_USERNAME]);
		connect.fils_erp_realm =
		nla_data(info->attrs[NL80211_ATTR_FILS_ERP_REALM]);
		connect.fils_erp_realm_len =
		nla_len(info->attrs[NL80211_ATTR_FILS_ERP_REALM]);
		connect.fils_erp_next_seq_num =
		nla_get_u16(
		info->attrs[NL80211_ATTR_FILS_ERP_NEXT_SEQ_NUM]);
		connect.fils_erp_rrk =
		nla_data(info->attrs[NL80211_ATTR_FILS_ERP_RRK]);
		connect.fils_erp_rrk_len =
		nla_len(info->attrs[NL80211_ATTR_FILS_ERP_RRK]);
		changed \|= UPDATE_FILS_ERP_INFO;
		} else if (info->attrs[NL80211_ATTR_FILS_ERP_USERNAME] \|\|
		info->attrs[NL80211_ATTR_FILS_ERP_REALM] \|\|
		info->attrs[NL80211_ATTR_FILS_ERP_NEXT_SEQ_NUM] \|\|
		info->attrs[NL80211_ATTR_FILS_ERP_RRK]) {
		return -EINVAL;
		}

		if (info->attrs[NL80211_ATTR_AUTH_TYPE]) {
		u32 auth_type =
		nla_get_u32(info->attrs[NL80211_ATTR_AUTH_TYPE]);
		if (!nl80211_valid_auth_type(rdev, auth_type,
		NL80211_CMD_CONNECT))
		return -EINVAL;
		connect.auth_type = auth_type;
		changed \|= UPDATE_AUTH_TYPE;
		}

		wdev_lock(dev->ieee80211_ptr);
		if (!wdev->current_bss)
		ret = -ENOLINK;
		@@ -10974,14 +11014,26 @@ static int nl80211_set_rekey_data(struct sk_buff skb, struct genl_info info)
		if (!tb[NL80211_REKEY_DATA_REPLAY_CTR] \|\| !tb[NL80211_REKEY_DATA_KEK] \|\|
		!tb[NL80211_REKEY_DATA_KCK])
		return -EINVAL;
		if (!tb[NL80211_REKEY_DATA_KEK] \|\| !tb[NL80211_REKEY_DATA_REPLAY_CTR] \|\|
		(!wiphy_ext_feature_isset(&rdev->wiphy,
		NL80211_EXT_FEATURE_FILS_SK_OFFLOAD) &&
		!wiphy_ext_feature_isset(&rdev->wiphy,
		NL80211_EXT_FEATURE_FILS_STA) &&
		!tb[NL80211_REKEY_DATA_KCK]))
		return -EINVAL;

		if (nla_len(tb[NL80211_REKEY_DATA_REPLAY_CTR]) != NL80211_REPLAY_CTR_LEN)
		return -ERANGE;
		if (nla_len(tb[NL80211_REKEY_DATA_KEK]) != NL80211_KEK_LEN)
		if (nla_len(tb[NL80211_REKEY_DATA_KEK]) < NL80211_KEK_LEN)
		return -ERANGE;
		if (nla_len(tb[NL80211_REKEY_DATA_KCK]) != NL80211_KCK_LEN)
		if (tb[NL80211_REKEY_DATA_KCK] &&
		nla_len(tb[NL80211_REKEY_DATA_KCK]) != NL80211_KCK_LEN)
		return -ERANGE;

		memset(&rekey_data, 0, sizeof(rekey_data));
		rekey_data.kek = nla_data(tb[NL80211_REKEY_DATA_KEK]);
		rekey_data.kek_len = nla_len(tb[NL80211_REKEY_DATA_KEK]);
		if (tb[NL80211_REKEY_DATA_KCK])
		rekey_data.kck = nla_data(tb[NL80211_REKEY_DATA_KCK]);
		rekey_data.replay_ctr = nla_data(tb[NL80211_REKEY_DATA_REPLAY_CTR]);