1 files changed, 83 insertions, 3 deletions

diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c
index e83e7fee3bc0..2aa6a2189842 100644
--- a/net/wireless/nl80211.c
+++ b/net/wireless/nl80211.c
@@ -23,6 +23,12 @@
 #include "nl80211.h"
 #include "reg.h"
 
+static bool nl80211_valid_auth_type(enum nl80211_auth_type auth_type);
+static int nl80211_crypto_settings(struct cfg80211_registered_device *rdev,
+                                   struct genl_info *info,
+                                   struct cfg80211_crypto_settings *settings,
+                                   int cipher_limit);
+
 static int nl80211_pre_doit(struct genl_ops *ops, struct sk_buff *skb,
                             struct genl_info *info);
 static void nl80211_post_doit(struct genl_ops *ops, struct sk_buff *skb,
@@ -178,6 +184,11 @@ static const struct nla_policy nl80211_policy[NL80211_ATTR_MAX+1] = {
         [NL80211_ATTR_SCHED_SCAN_INTERVAL] = { .type = NLA_U32 },
         [NL80211_ATTR_REKEY_DATA] = { .type = NLA_NESTED },
         [NL80211_ATTR_SCAN_SUPP_RATES] = { .type = NLA_NESTED },
+        [NL80211_ATTR_HIDDEN_SSID] = { .type = NLA_U32 },
+        [NL80211_ATTR_IE_PROBE_RESP] = { .type = NLA_BINARY,
+                                         .len = IEEE80211_MAX_DATA_LEN },
+        [NL80211_ATTR_IE_ASSOC_RESP] = { .type = NLA_BINARY,
+                                         .len = IEEE80211_MAX_DATA_LEN },
 };
 
 /* policy for the key attributes */
@@ -871,8 +882,7 @@ static int nl80211_send_wiphy(struct sk_buff *msg, u32 pid, u32 seq, int flags,
                 NLA_PUT_U32(msg, NL80211_ATTR_MAX_REMAIN_ON_CHANNEL_DURATION,
                             dev->wiphy.max_remain_on_channel_duration);
 
-        /* for now at least assume all drivers have it */
-        if (dev->ops->mgmt_tx)
+        if (dev->ops->mgmt_tx_cancel_wait)
                 NLA_PUT_FLAG(msg, NL80211_ATTR_OFFCHANNEL_TX_OK);
 
         if (mgmt_stypes) {
@@ -1985,7 +1995,10 @@ static int nl80211_addset_beacon(struct sk_buff *skb, struct genl_info *info)
         struct beacon_parameters params;
         int haveinfo = 0, err;
 
-        if (!is_valid_ie_attr(info->attrs[NL80211_ATTR_BEACON_TAIL]))
+        if (!is_valid_ie_attr(info->attrs[NL80211_ATTR_BEACON_TAIL]) ||
+            !is_valid_ie_attr(info->attrs[NL80211_ATTR_IE]) ||
+            !is_valid_ie_attr(info->attrs[NL80211_ATTR_IE_PROBE_RESP]) ||
+            !is_valid_ie_attr(info->attrs[NL80211_ATTR_IE_ASSOC_RESP]))
                 return -EINVAL;
 
         if (dev->ieee80211_ptr->iftype != NL80211_IFTYPE_AP &&
@@ -2011,6 +2024,49 @@ static int nl80211_addset_beacon(struct sk_buff *skb, struct genl_info *info)
                 if (err)
                         return err;
 
+                /*
+                 * In theory, some of these attributes could be required for
+                 * NEW_BEACON, but since they were not used when the command was
+                 * originally added, keep them optional for old user space
+                 * programs to work with drivers that do not need the additional
+                 * information.
+                 */
+                if (info->attrs[NL80211_ATTR_SSID]) {
+                        params.ssid = nla_data(info->attrs[NL80211_ATTR_SSID]);
+                        params.ssid_len =
+                                nla_len(info->attrs[NL80211_ATTR_SSID]);
+                        if (params.ssid_len == 0 ||
+                            params.ssid_len > IEEE80211_MAX_SSID_LEN)
+                                return -EINVAL;
+                }
+
+                if (info->attrs[NL80211_ATTR_HIDDEN_SSID]) {
+                        params.hidden_ssid = nla_get_u32(
+                                info->attrs[NL80211_ATTR_HIDDEN_SSID]);
+                        if (params.hidden_ssid !=
+                            NL80211_HIDDEN_SSID_NOT_IN_USE &&
+                            params.hidden_ssid !=
+                            NL80211_HIDDEN_SSID_ZERO_LEN &&
+                            params.hidden_ssid !=
+                            NL80211_HIDDEN_SSID_ZERO_CONTENTS)
+                                return -EINVAL;
+                }
+
+                params.privacy = !!info->attrs[NL80211_ATTR_PRIVACY];
+
+                if (info->attrs[NL80211_ATTR_AUTH_TYPE]) {
+                        params.auth_type = nla_get_u32(
+                                info->attrs[NL80211_ATTR_AUTH_TYPE]);
+                        if (!nl80211_valid_auth_type(params.auth_type))
+                                return -EINVAL;
+                } else
+                        params.auth_type = NL80211_AUTHTYPE_AUTOMATIC;
+
+                err = nl80211_crypto_settings(rdev, info, &params.crypto,
+                                              NL80211_MAX_NR_CIPHER_SUITES);
+                if (err)
+                        return err;
+
                 call = rdev->ops->add_beacon;
                 break;
         case NL80211_CMD_SET_BEACON:
@@ -2041,6 +2097,25 @@ static int nl80211_addset_beacon(struct sk_buff *skb, struct genl_info *info)
         if (!haveinfo)
                 return -EINVAL;
 
+        if (info->attrs[NL80211_ATTR_IE]) {
+                params.beacon_ies = nla_data(info->attrs[NL80211_ATTR_IE]);
+                params.beacon_ies_len = nla_len(info->attrs[NL80211_ATTR_IE]);
+        }
+
+        if (info->attrs[NL80211_ATTR_IE_PROBE_RESP]) {
+                params.proberesp_ies =
+                        nla_data(info->attrs[NL80211_ATTR_IE_PROBE_RESP]);
+                params.proberesp_ies_len =
+                        nla_len(info->attrs[NL80211_ATTR_IE_PROBE_RESP]);
+        }
+
+        if (info->attrs[NL80211_ATTR_IE_ASSOC_RESP]) {
+                params.assocresp_ies =
+                        nla_data(info->attrs[NL80211_ATTR_IE_ASSOC_RESP]);
+                params.assocresp_ies_len =
+                        nla_len(info->attrs[NL80211_ATTR_IE_ASSOC_RESP]);
+        }
+
         err = call(&rdev->wiphy, dev, &params);
         if (!err && params.interval)
                 wdev->beacon_interval = params.interval;
@@ -2237,6 +2312,10 @@ static int nl80211_send_station(struct sk_buff *msg, u32 pid, u32 seq,
         }
         nla_nest_end(msg, sinfoattr);
 
+        if (sinfo->filled & STATION_INFO_ASSOC_REQ_IES)
+                NLA_PUT(msg, NL80211_ATTR_IE, sinfo->assoc_req_ies_len,
+                        sinfo->assoc_req_ies);
+
         return genlmsg_end(msg, hdr);
 
  nla_put_failure:
@@ -2264,6 +2343,7 @@ static int nl80211_dump_station(struct sk_buff *skb,
         }
 
         while (1) {
+                memset(&sinfo, 0, sizeof(sinfo));
                 err = dev->ops->dump_station(&dev->wiphy, netdev, sta_idx,
                                              mac_addr, &sinfo);
                 if (err == -ENOENT)