]> www.infradead.org Git - users/jedix/linux-maple.git/commit
wifi: cfg80211: Move cfg80211_scan_req_add_chan() n_channels increment earlier
authorKees Cook <kees@kernel.org>
Mon, 30 Dec 2024 18:36:14 +0000 (10:36 -0800)
committerJohannes Berg <johannes.berg@intel.com>
Mon, 13 Jan 2025 14:34:06 +0000 (15:34 +0100)
commit3a0168626c138734490bc52c4105ce8e79d2f923
treec10f71c0fbb16f8e9b2b2c03abf19d485e01612b
parent7553477cbfd784b128297f9ed43751688415bbaa
wifi: cfg80211: Move cfg80211_scan_req_add_chan() n_channels increment earlier

Since adding __counted_by(n_channels) to struct cfg80211_scan_request,
anything adding to the channels array must increment n_channels first.
Move n_channels increment earlier.

Reported-by: John Rowley <lkml@johnrowley.me>
Closes: https://lore.kernel.org/stable/1815535c709ba9d9.156c6a5c9cdf6e59.b249b6b6a5ee4634@localhost.localdomain/
Fixes: aa4ec06c455d ("wifi: cfg80211: use __counted_by where appropriate")
Signed-off-by: Kees Cook <kees@kernel.org>
Reviewed-by: Gustavo A. R. Silva <gustavoars@kernel.org>
Link: https://patch.msgid.link/20241230183610.work.680-kees@kernel.org
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
net/wireless/scan.c