[ Sasha's backport helper bot ]
Hi,
The upstream commit SHA1 provided is correct: 2663d0462eb32ae7c9b035300ab6b1523886c718
WARNING: Author mismatch between patch and upstream commit: Backport author: Hardik Gohil hgohil@mvista.com Commit author: Kenton Groombridge concord@gentoo.org
Status in newer kernel trees: 6.12.y | Present (exact SHA1) 6.11.y | Present (exact SHA1) 6.6.y | Present (different SHA1: 26b177ecdd31) 6.1.y | Present (different SHA1: a2bb0c5d0086) 5.15.y | Not found 5.10.y | Not found
Note: The patch differs from the upstream commit: --- 1: 2663d0462eb32 ! 1: 102f30cc3d0ad wifi: mac80211: Avoid address calculations via out of bounds array indexing @@ Metadata ## Commit message ## wifi: mac80211: Avoid address calculations via out of bounds array indexing
+ [ Upstream commit 2663d0462eb32ae7c9b035300ab6b1523886c718 ] + req->n_channels must be set before req->channels[] can be used.
This patch fixes one of the issues encountered in [1]. @@ Commit message Signed-off-by: Kenton Groombridge concord@gentoo.org Link: https://msgid.link/20240605152218.236061-1-concord@gentoo.org Signed-off-by: Johannes Berg johannes.berg@intel.com + [Xiangyu: Modified to apply on 6.1.y and 6.6.y] + Signed-off-by: Xiangyu Chen xiangyu.chen@windriver.com + Signed-off-by: Sasha Levin sashal@kernel.org + Signed-off-by: Hardik Gohil hgohil@mvista.com
## net/mac80211/scan.c ## @@ net/mac80211/scan.c: static bool ieee80211_prep_hw_scan(struct ieee80211_sub_if_data *sdata) @@ net/mac80211/scan.c: static bool ieee80211_prep_hw_scan(struct ieee80211_sub_if_ }
- local->hw_scan_req->req.n_channels = n_chans; - ieee80211_prepare_scan_chandef(&chandef); + ieee80211_prepare_scan_chandef(&chandef, req->scan_width);
if (req->flags & NL80211_SCAN_FLAG_MIN_PREQ_CONTENT) ---
Results of testing on various branches:
| Branch | Patch Apply | Build Test | |---------------------------|-------------|------------| | stable/linux-5.10.y | Success | Success |