nl80211/cfg80211: Allow SSID to be specified in new beacon command

This makes it easier for drivers that generate Beacon and Probe Response
frames internally (in firmware most likely) in AP mode.

Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

1 files changed, 29 insertions, 0 deletions

diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c
index 080fd470fdec..fbb63d3ddc78 100644
--- a/net/wireless/nl80211.c
+++ b/net/wireless/nl80211.c
@@ -178,6 +178,7 @@ 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 },
 };
 
 /* policy for the key attributes */
@@ -2010,6 +2011,34 @@ 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;
+                }
+
                 call = rdev->ops->add_beacon;
                 break;
         case NL80211_CMD_SET_BEACON: