Commit 93e5a11e authored Sep 13, 2016 by Johannes Berg Committed by Sasha Levin Oct 05, 2016

nl80211: validate number of probe response CSA counters



[ Upstream commit ad5987b47e96a0fb6d13fea250e936aed000093c ]

Due to an apparent copy/paste bug, the number of counters for the
beacon configuration were checked twice, instead of checking the
number of probe response counters. Fix this to check the number of
probe response counters before parsing those.

Cc: stable@vger.kernel.org
Fixes: 9a774c78 ("cfg80211: Support multiple CSA counters")
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Sasha Levin <alexander.levin@verizon.com>

parent bc6285a7

net/wireless/nl80211.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -6033,7 +6033,7 @@ static int nl80211_channel_switch(struct sk_buff skb, struct genl_info info)

	params.n_counter_offsets_presp = len / sizeof(u16);		params.n_counter_offsets_presp = len / sizeof(u16);
	if (rdev->wiphy.max_num_csa_counters &&		if (rdev->wiphy.max_num_csa_counters &&
	(params.n_counter_offsets_beacon >		(params.n_counter_offsets_presp >
	rdev->wiphy.max_num_csa_counters))		rdev->wiphy.max_num_csa_counters))
	return -EINVAL;		return -EINVAL;