2020-08-05 20:02:55

by Johannes Berg

Subject: [PATCH] nl80211: fix NL80211_ATTR_HE_6GHZ_CAPABILITY usage

From: Johannes Berg <[email protected]>

In nl80211_set_station(), we check NL80211_ATTR_HE_6GHZ_CAPABILITY
and then use NL80211_ATTR_HE_CAPABILITY, which is clearly wrong.
Fix this to use NL80211_ATTR_HE_6GHZ_CAPABILITY as well.

Fixes: 43e64bf301fd ("cfg80211: handle 6 GHz capability of new station")
Signed-off-by: Johannes Berg <[email protected]>
---
net/wireless/nl80211.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c
index 19281d0c8c9d..bfda09d24146 100644
--- a/net/wireless/nl80211.c
+++ b/net/wireless/nl80211.c
@@ -6008,7 +6008,7 @@ static int nl80211_set_station(struct sk_buff *skb, struct genl_info *info)

if (info->attrs[NL80211_ATTR_HE_6GHZ_CAPABILITY])
params.he_6ghz_capa =
- nla_data(info->attrs[NL80211_ATTR_HE_CAPABILITY]);
+ nla_data(info->attrs[NL80211_ATTR_HE_6GHZ_CAPABILITY]);

if (info->attrs[NL80211_ATTR_AIRTIME_WEIGHT])
params.airtime_weight =
--
2.26.2

2020-08-10 03:33:52

by Rajkumar Manoharan

Subject: Re: [PATCH] nl80211: fix NL80211_ATTR_HE_6GHZ_CAPABILITY usage

On 2020-08-05 06:35, Johannes Berg wrote:
> From: Johannes Berg <[email protected]>
>
> In nl80211_set_station(), we check NL80211_ATTR_HE_6GHZ_CAPABILITY
> and then use NL80211_ATTR_HE_CAPABILITY, which is clearly wrong.
> Fix this to use NL80211_ATTR_HE_6GHZ_CAPABILITY as well.
>
> Fixes: 43e64bf301fd ("cfg80211: handle 6 GHz capability of new
> station")
> Signed-off-by: Johannes Berg <[email protected]>
> ---
> net/wireless/nl80211.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c
> index 19281d0c8c9d..bfda09d24146 100644
> --- a/net/wireless/nl80211.c
> +++ b/net/wireless/nl80211.c
> @@ -6008,7 +6008,7 @@ static int nl80211_set_station(struct sk_buff
> *skb, struct genl_info *info)
>
> if (info->attrs[NL80211_ATTR_HE_6GHZ_CAPABILITY])
> params.he_6ghz_capa =
> - nla_data(info->attrs[NL80211_ATTR_HE_CAPABILITY]);
> + nla_data(info->attrs[NL80211_ATTR_HE_6GHZ_CAPABILITY]);
>
Thanks for the fix :). Must have overlooked.

-Rajkumar