1 files changed, 45 insertions, 35 deletions

diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c
index 170c0abd2a01..af8d84a4a5b2 100644
--- a/net/wireless/nl80211.c
+++ b/net/wireless/nl80211.c
@@ -6593,19 +6593,30 @@ static struct genl_multicast_group nl80211_testmode_mcgrp = {
 static int nl80211_testmode_do(struct sk_buff *skb, struct genl_info *info)
 {
         struct cfg80211_registered_device *rdev = info->user_ptr[0];
+        struct wireless_dev *wdev =
+                __cfg80211_wdev_from_attrs(genl_info_net(info), info->attrs);
         int err;
 
+        if (!rdev->ops->testmode_cmd)
+                return -EOPNOTSUPP;
+
+        if (IS_ERR(wdev)) {
+                err = PTR_ERR(wdev);
+                if (err != -EINVAL)
+                        return err;
+                wdev = NULL;
+        } else if (wdev->wiphy != &rdev->wiphy) {
+                return -EINVAL;
+        }
+
         if (!info->attrs[NL80211_ATTR_TESTDATA])
                 return -EINVAL;
 
-        err = -EOPNOTSUPP;
-        if (rdev->ops->testmode_cmd) {
-                rdev->testmode_info = info;
-                err = rdev_testmode_cmd(rdev,
+        rdev->testmode_info = info;
+        err = rdev_testmode_cmd(rdev, wdev,
                                 nla_data(info->attrs[NL80211_ATTR_TESTDATA]),
                                 nla_len(info->attrs[NL80211_ATTR_TESTDATA]));
-                rdev->testmode_info = NULL;
-        }
+        rdev->testmode_info = NULL;
 
         return err;
 }
@@ -7567,14 +7578,12 @@ static int nl80211_set_cqm_txe(struct genl_info *info,
                                u32 rate, u32 pkts, u32 intvl)
 {
         struct cfg80211_registered_device *rdev = info->user_ptr[0];
-        struct wireless_dev *wdev;
         struct net_device *dev = info->user_ptr[1];
+        struct wireless_dev *wdev = dev->ieee80211_ptr;
 
         if (rate > 100 || intvl > NL80211_CQM_TXE_MAX_INTVL)
                 return -EINVAL;
 
-        wdev = dev->ieee80211_ptr;
-
         if (!rdev->ops->set_cqm_txe_config)
                 return -EOPNOTSUPP;
 
@@ -7589,13 +7598,15 @@ static int nl80211_set_cqm_rssi(struct genl_info *info,
                                 s32 threshold, u32 hysteresis)
 {
         struct cfg80211_registered_device *rdev = info->user_ptr[0];
-        struct wireless_dev *wdev;
         struct net_device *dev = info->user_ptr[1];
+        struct wireless_dev *wdev = dev->ieee80211_ptr;
 
         if (threshold > 0)
                 return -EINVAL;
 
-        wdev = dev->ieee80211_ptr;
+        /* disabling - hysteresis should also be zero then */
+        if (threshold == 0)
+                hysteresis = 0;
 
         if (!rdev->ops->set_cqm_rssi_config)
                 return -EOPNOTSUPP;
@@ -7614,36 +7625,33 @@ static int nl80211_set_cqm(struct sk_buff *skb, struct genl_info *info)
         int err;
 
         cqm = info->attrs[NL80211_ATTR_CQM];
-        if (!cqm) {
-                err = -EINVAL;
-                goto out;
-        }
+        if (!cqm)
+                return -EINVAL;
 
         err = nla_parse_nested(attrs, NL80211_ATTR_CQM_MAX, cqm,
                                nl80211_attr_cqm_policy);
         if (err)
-                goto out;
+                return err;
 
         if (attrs[NL80211_ATTR_CQM_RSSI_THOLD] &&
             attrs[NL80211_ATTR_CQM_RSSI_HYST]) {
-                s32 threshold;
-                u32 hysteresis;
-                threshold = nla_get_u32(attrs[NL80211_ATTR_CQM_RSSI_THOLD]);
-                hysteresis = nla_get_u32(attrs[NL80211_ATTR_CQM_RSSI_HYST]);
-                err = nl80211_set_cqm_rssi(info, threshold, hysteresis);
-        } else if (attrs[NL80211_ATTR_CQM_TXE_RATE] &&
-                   attrs[NL80211_ATTR_CQM_TXE_PKTS] &&
-                   attrs[NL80211_ATTR_CQM_TXE_INTVL]) {
-                u32 rate, pkts, intvl;
-                rate = nla_get_u32(attrs[NL80211_ATTR_CQM_TXE_RATE]);
-                pkts = nla_get_u32(attrs[NL80211_ATTR_CQM_TXE_PKTS]);
-                intvl = nla_get_u32(attrs[NL80211_ATTR_CQM_TXE_INTVL]);
-                err = nl80211_set_cqm_txe(info, rate, pkts, intvl);
-        } else
-                err = -EINVAL;
+                s32 threshold = nla_get_s32(attrs[NL80211_ATTR_CQM_RSSI_THOLD]);
+                u32 hysteresis = nla_get_u32(attrs[NL80211_ATTR_CQM_RSSI_HYST]);
 
-out:
-        return err;
+                return nl80211_set_cqm_rssi(info, threshold, hysteresis);
+        }
+
+        if (attrs[NL80211_ATTR_CQM_TXE_RATE] &&
+            attrs[NL80211_ATTR_CQM_TXE_PKTS] &&
+            attrs[NL80211_ATTR_CQM_TXE_INTVL]) {
+                u32 rate = nla_get_u32(attrs[NL80211_ATTR_CQM_TXE_RATE]);
+                u32 pkts = nla_get_u32(attrs[NL80211_ATTR_CQM_TXE_PKTS]);
+                u32 intvl = nla_get_u32(attrs[NL80211_ATTR_CQM_TXE_INTVL]);
+
+                return nl80211_set_cqm_txe(info, rate, pkts, intvl);
+        }
+
+        return -EINVAL;
 }
 
 static int nl80211_join_mesh(struct sk_buff *skb, struct genl_info *info)
@@ -10442,7 +10450,7 @@ EXPORT_SYMBOL(cfg80211_rx_unexpected_4addr_frame);
 int nl80211_send_mgmt(struct cfg80211_registered_device *rdev,
                       struct wireless_dev *wdev, u32 nlportid,
                       int freq, int sig_dbm,
-                      const u8 *buf, size_t len, gfp_t gfp)
+                      const u8 *buf, size_t len, u32 flags, gfp_t gfp)
 {
         struct net_device *netdev = wdev->netdev;
         struct sk_buff *msg;
@@ -10465,7 +10473,9 @@ int nl80211_send_mgmt(struct cfg80211_registered_device *rdev,
             nla_put_u32(msg, NL80211_ATTR_WIPHY_FREQ, freq) ||
             (sig_dbm &&
              nla_put_u32(msg, NL80211_ATTR_RX_SIGNAL_DBM, sig_dbm)) ||
-            nla_put(msg, NL80211_ATTR_FRAME, len, buf))
+            nla_put(msg, NL80211_ATTR_FRAME, len, buf) ||
+            (flags &&
+             nla_put_u32(msg, NL80211_ATTR_RXMGMT_FLAGS, flags)))
                 goto nla_put_failure;
 
         genlmsg_end(msg, hdr);