| Message ID | 20230723201043.3007430-1-ilan.peer@intel.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | fd7f08d92fcd7cc3eca0dd6c853f722a4c6176df |
| Delegated to: | Kalle Valo |
| Headers | show |
| Series | [v2] wifi: cfg80211: Fix return value in scan logic | expand |
Ilan Peer <ilan.peer@intel.com> wrote: > The reporter noticed a warning when running iwlwifi: > > WARNING: CPU: 8 PID: 659 at mm/page_alloc.c:4453 __alloc_pages+0x329/0x340 > > As cfg80211_parse_colocated_ap() is not expected to return a negative > value return 0 and not a negative value if cfg80211_calc_short_ssid() > fails. > > Fixes: c8cb5b854b40f ("nl80211/cfg80211: support 6 GHz scanning") > Closes: https://bugzilla.kernel.org/show_bug.cgi?id=217675 > Signed-off-by: Ilan Peer <ilan.peer@intel.com> Patch applied to wireless.git, thanks. fd7f08d92fcd wifi: cfg80211: Fix return value in scan logic
diff --git a/net/wireless/scan.c b/net/wireless/scan.c index 8bf00caf5d29..0cf1ce7b6934 100644 --- a/net/wireless/scan.c +++ b/net/wireless/scan.c @@ -657,7 +657,7 @@ static int cfg80211_parse_colocated_ap(const struct cfg80211_bss_ies *ies, ret = cfg80211_calc_short_ssid(ies, &ssid_elem, &s_ssid_tmp); if (ret) - return ret; + return 0; for_each_element_id(elem, WLAN_EID_REDUCED_NEIGHBOR_REPORT, ies->data, ies->len) {
As cfg80211_parse_colocated_ap() is not expected to return a negative value return 0 and not a negative value if cfg80211_calc_short_ssid() fails. Fixes: c8cb5b854b40f ("nl80211/cfg80211: support 6 GHz scanning") Link: https://bugzilla.kernel.org/show_bug.cgi?id=217675 Signed-off-by: Ilan Peer <ilan.peer@intel.com> --- net/wireless/scan.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)