mac80211_hwsim: Make sure NEW_RADIO contains final name
authorAndrew Zaborowski <andrew.zaborowski@intel.com>
Thu, 23 Feb 2017 12:02:10 +0000 (13:02 +0100)
committerJohannes Berg <johannes.berg@intel.com>
Mon, 6 Mar 2017 08:21:47 +0000 (09:21 +0100)
ieee80211_alloc_hw_nm will validate the requested name (if any) before
creating the new device and may use a name different from the one
requested rather than fail.  Make sure the HWSIM_CMD_NEW_RADIO
event/response generated has the final name or userspace will receive
the wrong name.  Note that mac80211_hwsim_new_radio may now modify
params.

A check for duplicate radio name could be added separately.

Signed-off-by: Andrew Zaborowski <andrew.zaborowski@intel.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
drivers/net/wireless/mac80211_hwsim.c

index 307a53a7da23ee324a0159de24b5b6db0d98ccb8..7b9662ae014320a184b0c049f06757b50d371bd1 100644 (file)
@@ -2438,6 +2438,9 @@ static int mac80211_hwsim_new_radio(struct genl_info *info,
                goto failed;
        }
 
+       /* ieee80211_alloc_hw_nm may have used a default name */
+       param->hwname = wiphy_name(hw->wiphy);
+
        if (info)
                net = genl_info_net(info);
        else