mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Johannes Berg <johannes@sipsolutions.net>
To: Mikhail Lobanov <m.lobanov@rosa.ru>
Cc: Shaul Triebitz <shaul.triebitz@intel.com>,
	Christophe Jaillet <christophe.jaillet@wanadoo.fr>,
	linux-wireless@vger.kernel.org,  linux-kernel@vger.kernel.org,
	lvc-project@linuxtesting.org
Subject: Re: [PATCH v3] wifi: mac80211: check basic rates validity in sta_link_apply_parameters
Date: Mon, 17 Mar 2025 08:25:43 +0100	[thread overview]
Message-ID: <a383d25de302699592bc99867dbf481cb2ab875b.camel@sipsolutions.net> (raw)
In-Reply-To: <20250315161253.19399-1-m.lobanov@rosa.ru>

On Sat, 2025-03-15 at 19:12 +0300, Mikhail Lobanov wrote:
> When userspace sets supported rates for a new station via
> NL80211_CMD_NEW_STATION, it might send a list that's empty
> or contains only invalid values. Currently, we process these
> values in sta_link_apply_parameters() without checking the result of
> ieee80211_parse_bitrates(), which can lead to an empty rates bitmap.
> 
> A similar issue was addressed for NL80211_CMD_SET_BSS in commit
> ce04abc3fcc6 ("wifi: mac80211: check basic rates validity").
> This patch applies the same approach in sta_link_apply_parameters()
> for NL80211_CMD_NEW_STATION, ensuring there is at least one valid
> rate by inspecting the result of ieee80211_parse_bitrates().
> 
> Found by Linux Verification Center (linuxtesting.org) with Syzkaller.
> 
> Fixes: b95eb7f0eee4 ("wifi: cfg80211/mac80211: separate link params from station params")
> Signed-off-by: Mikhail Lobanov <m.lobanov@rosa.ru>
> ---
> v2: Fixed the patch subject to provide a complete description.
> v3: added the missing if as Christophe Jaillet (christophe.jaillet@wanadoo.fr) noticed.
> 
>  net/mac80211/cfg.c | 9 +++++----
>  1 file changed, 5 insertions(+), 4 deletions(-)
> 
> diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c
> index 9351c64608a9..b4d18172da16 100644
> --- a/net/mac80211/cfg.c
> +++ b/net/mac80211/cfg.c
> @@ -1909,10 +1909,11 @@ static int sta_link_apply_parameters(struct ieee80211_local *local,
>  
>  	if (params->supported_rates &&
>  	    params->supported_rates_len) {
> -		ieee80211_parse_bitrates(link->conf->chanreq.oper.width,
> -					 sband, params->supported_rates,
> -					 params->supported_rates_len,
> -					 &link_sta->pub->supp_rates[sband->band]);
> +		if (!ieee80211_parse_bitrates(link->conf->chanreq.oper.width,
> +					      sband, params->supported_rates,
> +					      params->supported_rates_len,
> +					      &link_sta->pub->supp_rates[sband->band]))
> +			return -EINVAL;
>  	}

Seems you could remove the braces, and put it all into a single if
statement?

 if (... && ... && !parse(...))
     return -EINVAL;

I think?

johannes

      reply	other threads:[~2025-03-17  7:25 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2025-03-15 16:12 Mikhail Lobanov
2025-03-17  7:25 ` Johannes Berg [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=a383d25de302699592bc99867dbf481cb2ab875b.camel@sipsolutions.net \
    --to=johannes@sipsolutions.net \
    --cc=christophe.jaillet@wanadoo.fr \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-wireless@vger.kernel.org \
    --cc=lvc-project@linuxtesting.org \
    --cc=m.lobanov@rosa.ru \
    --cc=shaul.triebitz@intel.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®