Re: [PATCH] nl80211: add an option to allow MFP without requiring it

Igor Mitsyanko <igor.mitsyanko.os@xxxxxxxxxxxxx> · Mon, 14 Aug 2017 11:44:55 -0700

On 08/14/2017 06:49 AM, Emmanuel Grumbach wrote:

User space can now allow the kernel to associate to an AP
that requires MFP or that doesn't have MFP enabled in the
same NL80211_CMD_CONNECT command.
The driver / firmware will decide whether to use it or not.

Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@xxxxxxxxx>
---

No issues from quantenna driver.

Acked-by Igor Mitsyanko <igor.mitsyanko.os@xxxxxxxxxxxxx>

[...]

@@ -4086,10 +4090,12 @@ enum nl80211_key_type {
   * enum nl80211_mfp - Management frame protection state
   * @NL80211_MFP_NO: Management frame protection not used
   * @NL80211_MFP_REQUIRED: Management frame protection required
+ * @NL80211_MFP_OPTIONAL: Management frame is optional

Probably meant to be "Management frame _protection_ is optional"

   */
  enum nl80211_mfp {
         NL80211_MFP_NO,
         NL80211_MFP_REQUIRED,
+       NL80211_MFP_OPTIONAL,
  };

  enum nl80211_wpa_versions {

diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c
index 8f035d9868d1..829867132326 100644
--- a/net/wireless/nl80211.c
+++ b/net/wireless/nl80211.c
@@ -9115,6 +9115,7 @@ static int nl80211_connect(struct sk_buff *skb, struct genl_info *info)
         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_OPTIONAL &&
                     connect.mfp != NL80211_MFP_NO)
                         return -EINVAL;
         } else {
--
2.9.3








