Commit 366fc585 authored Dec 15, 2018 by Johannes Berg Committed by Greg Kroah-Hartman Jan 13, 2019

nl80211: fix memory leak if validate_pae_over_nl80211() fails



[ Upstream commit d350a0f431189517b1af0dbbb605c273231a8966 ]

If validate_pae_over_nl80211() were to fail in nl80211_crypto_settings(),
we might leak the 'connkeys' allocation. Fix this.

Fixes: 64bf3d4b ("nl80211: Add CONTROL_PORT_OVER_NL80211 attribute")
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>

parent 098143bf

net/wireless/nl80211.c

+3 −1

Original line number	Diff line number	Diff line
		@@ -8993,8 +8993,10 @@ static int nl80211_join_ibss(struct sk_buff skb, struct genl_info info)
		if (info->attrs[NL80211_ATTR_CONTROL_PORT_OVER_NL80211]) {
		int r = validate_pae_over_nl80211(rdev, info);

		if (r < 0)
		if (r < 0) {
		kzfree(connkeys);
		return r;
		}

		ibss.control_port_over_nl80211 = true;
		}