Merge tag 'mac80211-for-davem-2017-02-28' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211

Johannes Berg says:

====================
First round of fixes - details in the commits:
 * use a valid hrtimer clock ID in mac80211_hwsim
 * don't reorder frames prior to BA session
 * flush a delayed work at suspend so the state is all valid before
   suspend/resume
 * fix packet statistics in fast-RX, the RX packets
   counter increment was simply missing
 * don't try to re-transmit filtered frames in an aggregation session
 * shorten (for tracing) a debug message
 * typo fix in another debug message
 * fix nul-termination with HWSIM_ATTR_RADIO_NAME in hwsim
 * fix mgmt RX processing when station is looked up by driver/device
====================

Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 21 insertions, 7 deletions

diff --git a/drivers/net/wireless/mac80211_hwsim.c b/drivers/net/wireless/mac80211_hwsim.c
index 0889fc81ce9e..50c219fb1a52 100644
--- a/drivers/net/wireless/mac80211_hwsim.c
+++ b/drivers/net/wireless/mac80211_hwsim.c
@@ -3056,6 +3056,7 @@ static int hwsim_register_received_nl(struct sk_buff *skb_2,
 static int hwsim_new_radio_nl(struct sk_buff *msg, struct genl_info *info)
 {
         struct hwsim_new_radio_params param = { 0 };
+        const char *hwname = NULL;
 
         param.reg_strict = info->attrs[HWSIM_ATTR_REG_STRICT_REG];
         param.p2p_device = info->attrs[HWSIM_ATTR_SUPPORT_P2P_DEVICE];
@@ -3069,8 +3070,14 @@ static int hwsim_new_radio_nl(struct sk_buff *msg, struct genl_info *info)
         if (info->attrs[HWSIM_ATTR_NO_VIF])
                 param.no_vif = true;
 
-        if (info->attrs[HWSIM_ATTR_RADIO_NAME])
-                param.hwname = nla_data(info->attrs[HWSIM_ATTR_RADIO_NAME]);
+        if (info->attrs[HWSIM_ATTR_RADIO_NAME]) {
+                hwname = kasprintf(GFP_KERNEL, "%.*s",
+                                   nla_len(info->attrs[HWSIM_ATTR_RADIO_NAME]),
+                                   (char *)nla_data(info->attrs[HWSIM_ATTR_RADIO_NAME]));
+                if (!hwname)
+                        return -ENOMEM;
+                param.hwname = hwname;
+        }
 
         if (info->attrs[HWSIM_ATTR_USE_CHANCTX])
                 param.use_chanctx = true;
@@ -3098,11 +3105,15 @@ static int hwsim_del_radio_nl(struct sk_buff *msg, struct genl_info *info)
         s64 idx = -1;
         const char *hwname = NULL;
 
-        if (info->attrs[HWSIM_ATTR_RADIO_ID])
+        if (info->attrs[HWSIM_ATTR_RADIO_ID]) {
                 idx = nla_get_u32(info->attrs[HWSIM_ATTR_RADIO_ID]);
-        else if (info->attrs[HWSIM_ATTR_RADIO_NAME])
-                hwname = (void *)nla_data(info->attrs[HWSIM_ATTR_RADIO_NAME]);
-        else
+        } else if (info->attrs[HWSIM_ATTR_RADIO_NAME]) {
+                hwname = kasprintf(GFP_KERNEL, "%.*s",
+                                   nla_len(info->attrs[HWSIM_ATTR_RADIO_NAME]),
+                                   (char *)nla_data(info->attrs[HWSIM_ATTR_RADIO_NAME]));
+                if (!hwname)
+                        return -ENOMEM;
+        } else
                 return -EINVAL;
 
         spin_lock_bh(&hwsim_radio_lock);
@@ -3111,7 +3122,8 @@ static int hwsim_del_radio_nl(struct sk_buff *msg, struct genl_info *info)
                         if (data->idx != idx)
                                 continue;
                 } else {
-                        if (strcmp(hwname, wiphy_name(data->hw->wiphy)))
+                        if (!hwname ||
+                            strcmp(hwname, wiphy_name(data->hw->wiphy)))
                                 continue;
                 }
 
@@ -3122,10 +3134,12 @@ static int hwsim_del_radio_nl(struct sk_buff *msg, struct genl_info *info)
                 spin_unlock_bh(&hwsim_radio_lock);
                 mac80211_hwsim_del_radio(data, wiphy_name(data->hw->wiphy),
                                          info);
+                kfree(hwname);
                 return 0;
         }
         spin_unlock_bh(&hwsim_radio_lock);
 
+        kfree(hwname);
         return -ENODEV;
 }