Commit 816e4c54 authored Nov 10, 2017 by Ben Hutchings Committed by Alistair Strachan Apr 27, 2018

UPSTREAM: mac80211_hwsim: Fix memory leak in hwsim_new_radio_nl()



[ Upstream commit 67bd52386125ce1159c0581cbcd2740addf33cd4 ]

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: ff4dd73dd2b4 ("mac80211_hwsim: check HWSIM_ATTR_RADIO_NAME length")
Signed-off-by: Ben Hutchings <ben.hutchings@codethink.co.uk>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
(cherry picked from commit 32f8870cc9a92467c411b492c6bf4781c41f0afa)
Bug: 70214720
Change-Id: Ieebed8c18bce0569fff9849bd8265da9ddb6d4dc
Signed-off-by: Alistair Strachan <astrachan@google.com>

parent 6380c410

drivers/net/wireless/mac80211_hwsim.c

+4 −1

Original line number	Diff line number	Diff line
		@@ -2610,6 +2610,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];
		@@ -2649,7 +2650,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)