diff options
| author | Haoyu Li <lihaoyu499@gmail.com> | 2024-11-24 01:25:00 +0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2024-12-19 18:13:10 +0100 |
| commit | 1145c393651c6b58897d28f2d23d4e5ee3c303e0 (patch) | |
| tree | 2cf24578fa77da3c747bff07eb32c7e944f56bf4 /net | |
| parent | f850d1d9f1106f528dfc5807565f2d1fa9a397d3 (diff) | |
| download | linux-1145c393651c6b58897d28f2d23d4e5ee3c303e0.tar.gz linux-1145c393651c6b58897d28f2d23d4e5ee3c303e0.tar.bz2 linux-1145c393651c6b58897d28f2d23d4e5ee3c303e0.zip | |
wifi: mac80211: init cnt before accessing elem in ieee80211_copy_mbssid_beacon
[ Upstream commit 496db69fd860570145f7c266b31f3af85fca5b00 ]
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>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'net')
| -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 6dfc61a9acd4..242b718b1cd9 100644 --- a/net/mac80211/cfg.c +++ b/net/mac80211/cfg.c @@ -1061,13 +1061,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; } |