projects
/
wrapfs-5.15.y.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
714794e
)
wifi: nl80211: don't free NULL coalescing rule
author
Johannes Berg
<johannes.berg@intel.com>
Thu, 18 Apr 2024 08:52:23 +0000
(10:52 +0200)
committer
Greg Kroah-Hartman
<gregkh@linuxfoundation.org>
Fri, 17 May 2024 09:50:44 +0000
(11:50 +0200)
[ Upstream commit
801ea33ae82d6a9d954074fbcf8ea9d18f1543a7
]
If the parsing fails, we can dereference a NULL pointer here.
Cc: stable@vger.kernel.org
Fixes: be29b99a9b51 ("cfg80211/nl80211: Add packet coalesce support")
Reviewed-by: Miriam Rachel Korenblit <miriam.rachel.korenblit@intel.com>
Link:
https://msgid.link/20240418105220.b328f80406e7.Id75d961050deb05b3e4e354e024866f350c68103@changeid
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
net/wireless/nl80211.c
patch
|
blob
|
history
diff --git
a/net/wireless/nl80211.c
b/net/wireless/nl80211.c
index 99149b10f86f6097ec64d0c5689a288bdcf4823a..d758ec56558928c51ae89f569ade173dcbdd7c0e 100644
(file)
--- a/
net/wireless/nl80211.c
+++ b/
net/wireless/nl80211.c
@@
-12890,6
+12890,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);