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

Commit 97792d06 authored by Johannes Berg's avatar Johannes Berg Committed by Greg Kroah-Hartman
Browse files

wifi: nl80211: don't free NULL coalescing rule 



[ Upstream commit 801ea33ae82d6a9d954074fbcf8ea9d18f1543a7 ]

If the parsing fails, we can dereference a NULL pointer here.

Cc: stable@vger.kernel.org
Fixes: be29b99a ("cfg80211/nl80211: Add packet coalesce support")
Reviewed-by: default avatarMiriam Rachel Korenblit <miriam.rachel.korenblit@intel.com>
Link: https://msgid.link/20240418105220.b328f80406e7.Id75d961050deb05b3e4e354e024866f350c68103@changeid


Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 3762017c

net/wireless/nl80211.c

+2 −0
Original line number Diff line number Diff line
@@ -12023,6 +12023,8 @@ static int nl80211_set_coalesce(struct sk_buff *skb, struct genl_info *info) 
error:

	for (i = 0; i < new_coalesce.n_rules; i++) {

		tmp_rule = &new_coalesce.rules[i];

		if (!tmp_rule)

			continue;

		for (j = 0; j < tmp_rule->n_patterns; j++)

			kfree(tmp_rule->patterns[j].mask);

		kfree(tmp_rule->patterns);