]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commitdiff
mac80211_hwsim: fix possible memory leak in hwsim_new_radio_nl()
authorweiyongjun (A) <weiyongjun1@huawei.com>
Thu, 18 Jan 2018 02:23:34 +0000 (02:23 +0000)
committerJohannes Berg <johannes.berg@intel.com>
Mon, 22 Jan 2018 13:03:29 +0000 (14:03 +0100)
'hwname' is malloced in hwsim_new_radio_nl() and should be freed
before leaving from the error handling cases, otherwise it will cause
memory leak.

Fixes: ff4dd73dd2b4 ("mac80211_hwsim: check HWSIM_ATTR_RADIO_NAME length")
Signed-off-by: Wei Yongjun <weiyongjun1@huawei.com>
Reviewed-by: Ben Hutchings <ben.hutchings@codethink.co.uk>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
drivers/net/wireless/mac80211_hwsim.c

index 6bf063adcbde531fda67a3e4b4960397192e4fff..66c2ac0397dad5f4d12d18f090161fbf79e8d4de 100644 (file)
@@ -3197,8 +3197,10 @@ static int hwsim_new_radio_nl(struct sk_buff *msg, struct genl_info *info)
        if (info->attrs[HWSIM_ATTR_REG_CUSTOM_REG]) {
                u32 idx = nla_get_u32(info->attrs[HWSIM_ATTR_REG_CUSTOM_REG]);
 
-               if (idx >= ARRAY_SIZE(hwsim_world_regdom_custom))
+               if (idx >= ARRAY_SIZE(hwsim_world_regdom_custom)) {
+                       kfree(hwname);
                        return -EINVAL;
+               }
                param.regd = hwsim_world_regdom_custom[idx];
        }