Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 67bd5238 authored by Ben Hutchings's avatar Ben Hutchings Committed by Johannes Berg
Browse files

mac80211_hwsim: Fix memory leak in hwsim_new_radio_nl() 



hwsim_new_radio_nl() now copies the name attribute in order to add a
null-terminator.  mac80211_hwsim_new_radio() (indirectly) copies it
again into the net_device structure, so the first copy is not used or
freed later.  Free the first copy before returning.

Fixes: ff4dd73d ("mac80211_hwsim: check HWSIM_ATTR_RADIO_NAME length")
Signed-off-by: default avatarBen Hutchings <ben.hutchings@codethink.co.uk>
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent d7be102f

drivers/net/wireless/mac80211_hwsim.c

+4 −1
Original line number Diff line number Diff line
@@ -3108,6 +3108,7 @@ 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;

	int ret;



	param.reg_strict = info->attrs[HWSIM_ATTR_REG_STRICT_REG];

	param.p2p_device = info->attrs[HWSIM_ATTR_SUPPORT_P2P_DEVICE];
@@ -3147,7 +3148,9 @@ static int hwsim_new_radio_nl(struct sk_buff *msg, struct genl_info *info) 
		param.regd = hwsim_world_regdom_custom[idx];

	}



	return mac80211_hwsim_new_radio(info, &param);

	ret = mac80211_hwsim_new_radio(info, &param);

	kfree(hwname);

	return ret;

}



static int hwsim_del_radio_nl(struct sk_buff *msg, struct genl_info *info)