2023-07-23 12:24:54

by Ilan Peer

Subject: [PATCH v2] wifi: cfg80211: Fix return value in scan logic

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 <[email protected]>
---
net/wireless/scan.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

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) {
--
2.25.1

2023-07-26 07:29:19

by Kalle Valo

Subject: Re: [v2] wifi: cfg80211: Fix return value in scan logic

Ilan Peer <[email protected]> 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 <[email protected]>

Patch applied to wireless.git, thanks.

fd7f08d92fcd wifi: cfg80211: Fix return value in scan logic

--
https://patchwork.kernel.org/project/linux-wireless/patch/[email protected]/

https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches