Merge "cfg80211: Authentication offload to user space in AP mode" (71f1e4e5) · Commits · e / devices / android_kernel_oneplus_sm8150

include/net/cfg80211.h

+15 −0

Original line number	Diff line number	Diff line
		@@ -754,6 +754,17 @@ struct cfg80211_bitrate_mask {
		} control[NUM_NL80211_BANDS];
		};

		/**
		* enum cfg80211_ap_settings_flags - AP settings flags
		*
		* Used by cfg80211_ap_settings
		*
		* @AP_SETTINGS_EXTERNAL_AUTH_SUPPORT: AP supports external authentication
		*/
		enum cfg80211_ap_settings_flags {
		AP_SETTINGS_EXTERNAL_AUTH_SUPPORT = BIT(0),
		};

		/**
		* struct cfg80211_ap_settings - AP configuration
		*
		@@ -783,6 +794,7 @@ struct cfg80211_bitrate_mask {
		* @vht_cap: VHT capabilities (or %NULL if VHT isn't enabled)
		* @ht_required: stations must support HT
		* @vht_required: stations must support VHT
		* @flags: flags, as defined in enum cfg80211_ap_settings_flags
		*/
		struct cfg80211_ap_settings {
		struct cfg80211_chan_def chandef;
		@@ -807,6 +819,7 @@ struct cfg80211_ap_settings {
		const struct ieee80211_ht_cap *ht_cap;
		const struct ieee80211_vht_cap *vht_cap;
		bool ht_required, vht_required;
		u32 flags;
		};

		/**
		@@ -2655,6 +2668,7 @@ struct cfg80211_pmk_conf {
		* use %WLAN_STATUS_UNSPECIFIED_FAILURE if user space cannot give you
		* the real status code for failures. Used only for the authentication
		* response command interface (user space to driver).
		* @pmkid: The identifier to refer a PMKSA.
		*/
		struct cfg80211_external_auth_params {
		enum nl80211_external_auth_action action;
		@@ -2662,6 +2676,7 @@ struct cfg80211_external_auth_params {
		struct cfg80211_ssid ssid;
		unsigned int key_mgmt_suite;
		u16 status;
		const u8 *pmkid;
		};

		/**

+9 −4

Original line number	Diff line number	Diff line
		@@ -2185,9 +2185,9 @@ enum nl80211_commands {
		* &NL80211_CMD_EXTERNAL_AUTH request event.
		* @NL80211_ATTR_EXTERNAL_AUTH_SUPPORT: Flag attribute indicating that the user
		* space supports external authentication. This attribute shall be used
		* only with %NL80211_CMD_CONNECT request. The driver may offload
		* authentication processing to user space if this capability is indicated
		* in NL80211_CMD_CONNECT requests from the user space.
		* with %NL80211_CMD_CONNECT and %NL80211_CMD_START_AP request. The driver
		* may offload authentication processing to user space if this capability
		* is indicated in the respective requests from the user space.
		*
		* @NUM_NL80211_ATTR: total number of nl80211_attrs available
		* @NL80211_ATTR_MAX: highest attribute number currently defined
		@@ -5277,9 +5277,14 @@ enum nl80211_crit_proto_id {
		* Used by cfg80211_rx_mgmt()
		*
		* @NL80211_RXMGMT_FLAG_ANSWERED: frame was answered by device/driver.
		* @NL80211_RXMGMT_FLAG_EXTERNAL_AUTH: Host driver intends to offload
		* the authentication. Exclusively defined for host drivers that
		* advertises the SME functionality but would like the userspace
		* to handle certain authentication algorithms (e.g. SAE).
		*/
		enum nl80211_rxmgmt_flags {
		NL80211_RXMGMT_FLAG_ANSWERED = 1 << 0,
		NL80211_RXMGMT_FLAG_EXTERNAL_AUTH = 1 << 1,
		};

		/*

+18 −7

Original line number	Diff line number	Diff line
		@@ -4068,6 +4068,9 @@ static int nl80211_start_ap(struct sk_buff skb, struct genl_info info)

		nl80211_calculate_ap_params(&params);

		if (info->attrs[NL80211_ATTR_EXTERNAL_AUTH_SUPPORT])
		params.flags \|= AP_SETTINGS_EXTERNAL_AUTH_SUPPORT;

		wdev_lock(wdev);
		err = rdev_start_ap(rdev, dev, &params);
		if (!err) {
		@@ -12491,7 +12494,9 @@ static int nl80211_external_auth(struct sk_buff skb, struct genl_info info)
		if (!rdev->ops->external_auth)
		return -EOPNOTSUPP;

		if (!info->attrs[NL80211_ATTR_SSID])
		if (!info->attrs[NL80211_ATTR_SSID] &&
		dev->ieee80211_ptr->iftype != NL80211_IFTYPE_AP &&
		dev->ieee80211_ptr->iftype != NL80211_IFTYPE_P2P_GO)
		return -EINVAL;

		if (!info->attrs[NL80211_ATTR_BSSID])
		@@ -12502,18 +12507,24 @@ static int nl80211_external_auth(struct sk_buff skb, struct genl_info info)

		memset(&params, 0, sizeof(params));

		if (info->attrs[NL80211_ATTR_SSID]) {
		params.ssid.ssid_len = nla_len(info->attrs[NL80211_ATTR_SSID]);
		if (params.ssid.ssid_len == 0 \|\|
		params.ssid.ssid_len > IEEE80211_MAX_SSID_LEN)
		return -EINVAL;
		memcpy(params.ssid.ssid, nla_data(info->attrs[NL80211_ATTR_SSID]),
		memcpy(params.ssid.ssid,
		nla_data(info->attrs[NL80211_ATTR_SSID]),
		params.ssid.ssid_len);
		}

		memcpy(params.bssid, nla_data(info->attrs[NL80211_ATTR_BSSID]),
		ETH_ALEN);

		params.status = nla_get_u16(info->attrs[NL80211_ATTR_STATUS_CODE]);

		if (info->attrs[NL80211_ATTR_PMKID])
		params.pmkid = nla_data(info->attrs[NL80211_ATTR_PMKID]);

		return rdev_external_auth(rdev, dev, &params);
		}