netdev - Re: [PATCH] wifi: mac80211: check basic rates validity

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <32760fe6-160d-410a-b85d-6f26687f405a@gmail.com>
Date: Mon, 29 Jul 2024 15:51:34 +0200
From: vincenzo mezzela <vincenzo.mezzela@...il.com>
To: johannes@...solutions.net, sashal@...nel.org, gregkh@...uxfoundation.org
Cc: linux-wireless@...r.kernel.org, netdev@...r.kernel.org,
 javier.carrasco.cruz@...il.com, skhan@...uxfoundation.org,
 stable@...r.kernel.org, Johannes Berg <johannes.berg@...el.com>,
 syzbot+07bee335584b04e7c2f8@...kaller.appspotmail.com
Subject: Re: [PATCH] wifi: mac80211: check basic rates validity

On 7/29/24 15:43, Vincenzo Mezzela wrote:
> From: Johannes Berg <johannes.berg@...el.com>
>
> commit ce04abc3fcc62cd5640af981ebfd7c4dc3bded28 upstream.
>
> When userspace sets basic rates, it might send us some rates
> list that's empty or consists of invalid values only. We're
> currently ignoring invalid values and then may end up with a
> rates bitmap that's empty, which later results in a warning.
>
> Reject the call if there were no valid rates.
>
> [ Conflict resolution involved adjusting the patch to accommodate
> changes in the function signature of ieee80211_parse_bitrates and
> ieee80211_check_rate_mask ]
>
> Signed-off-by: Johannes Berg <johannes.berg@...el.com>
> Reported-by: syzbot+07bee335584b04e7c2f8@...kaller.appspotmail.com
> Tested-by: syzbot+07bee335584b04e7c2f8@...kaller.appspotmail.com
> Closes: https://syzkaller.appspot.com/bug?extid=07bee335584b04e7c2f8
> Signed-off-by: Vincenzo Mezzela <vincenzo.mezzela@...il.com>
> ---
> Hi,
> please note that a backport of the same patch for v5.15 is available at
> [1].
>
> Thanks,
> Vincenzo
>
> - [1] https://lore.kernel.org/all/20240727125033.1774143-1-vincenzo.mezzela@gmail.com/
>   net/mac80211/cfg.c | 21 +++++++++++----------
>   1 file changed, 11 insertions(+), 10 deletions(-)
>
> diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c
> index 2c60fc165801..d121a3b460f4 100644
> --- a/net/mac80211/cfg.c
> +++ b/net/mac80211/cfg.c
> @@ -2577,6 +2577,17 @@ static int ieee80211_change_bss(struct wiphy *wiphy,
>   	if (!sband)
>   		return -EINVAL;
>   
> +	if (params->basic_rates) {
> +		if (!ieee80211_parse_bitrates(sdata->vif.bss_conf.chandef.width,
> +					      wiphy->bands[sband->band],
> +					      params->basic_rates,
> +					      params->basic_rates_len,
> +					      &sdata->vif.bss_conf.basic_rates))
> +			return -EINVAL;
> +		changed |= BSS_CHANGED_BASIC_RATES;
> +		ieee80211_check_rate_mask(&sdata->deflink);
> +	}
> +
>   	if (params->use_cts_prot >= 0) {
>   		sdata->vif.bss_conf.use_cts_prot = params->use_cts_prot;
>   		changed |= BSS_CHANGED_ERP_CTS_PROT;
> @@ -2600,16 +2611,6 @@ static int ieee80211_change_bss(struct wiphy *wiphy,
>   		changed |= BSS_CHANGED_ERP_SLOT;
>   	}
>   
> -	if (params->basic_rates) {
> -		ieee80211_parse_bitrates(sdata->vif.bss_conf.chandef.width,
> -					 wiphy->bands[sband->band],
> -					 params->basic_rates,
> -					 params->basic_rates_len,
> -					 &sdata->vif.bss_conf.basic_rates);
> -		changed |= BSS_CHANGED_BASIC_RATES;
> -		ieee80211_check_rate_mask(&sdata->deflink);
> -	}
> -
>   	if (params->ap_isolate >= 0) {
>   		if (params->ap_isolate)
>   			sdata->flags |= IEEE80211_SDATA_DONT_BRIDGE_PACKETS;
Hi,
this is a backport for v6.1, I forgot to add the TAG in the subject of 
the email.
Should I resend a new patch with the correct version TAG?

Thanks,
Vincenzo