diff options
| author |   Haoyu Li <lihaoyu499@gmail.com> | 2024-11-24 01:25:00 +0800 |
|---|---|---|
| committer |   Johannes Berg <johannes.berg@intel.com> | 2024-12-03 11:27:24 +0100 |
| commit | 496db69fd860570145f7c266b31f3af85fca5b00 (patch) | |
| tree | b29bc7486b00cec5d484a71c20541ce296925360 | |
| parent | wifi: mac80211: fix mbss changed flags corruption on 32 bit systems (diff) | |
| download | wireguard-linux-496db69fd860570145f7c266b31f3af85fca5b00.tar.xz wireguard-linux-496db69fd860570145f7c266b31f3af85fca5b00.zip | |
wifi: mac80211: init cnt before accessing elem in ieee80211_copy_mbssid_beacon
With the new __counted_by annocation in cfg80211_mbssid_elems,
the "cnt" struct member must be set before accessing the "elem"
array. Failing to do so will trigger a runtime warning when enabling
CONFIG_UBSAN_BOUNDS and CONFIG_FORTIFY_SOURCE.
Fixes: c14679d7005a ("wifi: cfg80211: Annotate struct cfg80211_mbssid_elems with __counted_by")
Signed-off-by: Haoyu Li <lihaoyu499@gmail.com>
Link: https://patch.msgid.link/20241123172500.311853-1-lihaoyu499@gmail.com
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
| -rw-r--r-- | net/mac80211/cfg.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c index 61a824ec33da..1dd61c9bb8f1 100644 --- a/net/mac80211/cfg.c +++ b/net/mac80211/cfg.c @@ -1088,13 +1088,13 @@ ieee80211_copy_mbssid_beacon(u8 *pos, struct cfg80211_mbssid_elems *dst, { int i, offset = 0; + dst->cnt = src->cnt; for (i = 0; i < src->cnt; i++) { memcpy(pos + offset, src->elem[i].data, src->elem[i].len); dst->elem[i].len = src->elem[i].len; dst->elem[i].data = pos + offset; offset += dst->elem[i].len; } - dst->cnt = src->cnt; return offset; } |