projects
/
linux.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
98849ba
)
wifi: mac80211: mesh: check element parsing succeeded
author
Johannes Berg
<johannes.berg@intel.com>
Mon, 11 Dec 2023 07:05:32 +0000
(09:05 +0200)
committer
Johannes Berg
<johannes.berg@intel.com>
Tue, 12 Dec 2023 09:14:57 +0000
(10:14 +0100)
ieee802_11_parse_elems() can return NULL, so we must
check for the return value.
Fixes: 5d24828d05f3 ("mac80211: always allocate struct ieee802_11_elems")
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Miri Korenblit <miriam.rachel.korenblit@intel.com>
Link:
https://msgid.link/20231211085121.93dea364f3d3.Ie87781c6c48979fb25a744b90af4a33dc2d83a28@changeid
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
net/mac80211/mesh_plink.c
patch
|
blob
|
history
diff --git
a/net/mac80211/mesh_plink.c
b/net/mac80211/mesh_plink.c
index dbabeefe451513b66de5b4956041056f1ae79797..2da6ecf0077d2ea8cb6e01461891f7bf3494123d 100644
(file)
--- a/
net/mac80211/mesh_plink.c
+++ b/
net/mac80211/mesh_plink.c
@@
-1247,6
+1247,8
@@
void mesh_rx_plink_frame(struct ieee80211_sub_if_data *sdata,
return;
}
elems = ieee802_11_parse_elems(baseaddr, len - baselen, true, NULL);
- mesh_process_plink_frame(sdata, mgmt, elems, rx_status);
- kfree(elems);
+ if (elems) {
+ mesh_process_plink_frame(sdata, mgmt, elems, rx_status);
+ kfree(elems);
+ }
}