pull-request: wireless-2023-03-10

pull-request: wireless-2023-03-10

[Johannes Berg]

Hi,

For now in wireless we only have a few fixes for some
recently reported (and mostly recently introduced)
problems.

Please pull and let me know if there's any problem.

Thanks,
johannes



The following changes since commit 44889ba56cbb3d51154660ccd15818bc77276696:

  Merge tag 'net-6.3-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net (2023-03-09 10:56:58 -0800)

are available in the Git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless.git tags/wireless-2023-03-10

for you to fetch changes up to 96c069508377547f913e7265a80fffe9355de592:

  wifi: cfg80211: fix MLO connection ownership (2023-03-10 11:47:25 +0100)

----------------------------------------------------------------
Just a few fixes:
 * MLO connection socket ownership didn't work
 * basic rates validation was missing (reported by
   by a private syzbot instances)
 * puncturing bitmap netlink policy was completely broken
 * properly check chandef for NULL channel, it can be
   pointing to a chandef that's still uninitialized

----------------------------------------------------------------
Johannes Berg (4):
      wifi: nl80211: fix NULL-ptr deref in offchan check
      wifi: nl80211: fix puncturing bitmap policy
      wifi: mac80211: check basic rates validity
      wifi: cfg80211: fix MLO connection ownership

 net/mac80211/cfg.c     | 21 +++++++++++----------
 net/wireless/nl80211.c | 26 +++++++++++++++-----------
 2 files changed, 26 insertions(+), 21 deletions(-)

Re: pull-request: wireless-2023-03-10

[patchwork-bot+netdevbpf]

Hello:

This pull request was applied to netdev/net.git (main)
by Jakub Kicinski <kuba@kernel.org>:

On Fri, 10 Mar 2023 12:46:46 +0100 you wrote:
> Hi,
> 
> For now in wireless we only have a few fixes for some
> recently reported (and mostly recently introduced)
> problems.
> 
> Please pull and let me know if there's any problem.
> 
> [...]

Here is the summary with links:
  - pull-request: wireless-2023-03-10
    https://git.kernel.org/netdev/net/c/27c30b9b449a

You are awesome, thank you!
-- 
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html

Re: pull-request: wireless-2023-03-10: manual merge

[Matthieu Baerts]

[-- Attachment #1: Type: text/plain, Size: 941 bytes --]

Hi Johannes,

(+cc Jakub and Stephen)

On 10/03/2023 12:46, Johannes Berg wrote:
> Hi,
> 
> For now in wireless we only have a few fixes for some
> recently reported (and mostly recently introduced)
> problems.

(...)

> Johannes Berg (4):
>       wifi: nl80211: fix NULL-ptr deref in offchan check
>       wifi: nl80211: fix puncturing bitmap policy

FYI, we got a small conflict when merging -net in net-next in the MPTCP
tree due to this patch applied in -net:

  b27f07c50a73 ("wifi: nl80211: fix puncturing bitmap policy")

and this one from net-next:

  cbbaf2bb829b ("wifi: nl80211: add a command to enable/disable HW
timestamping")

The conflict has been resolved on our side[1] by keeping the
modifications from both sides and the resolution we suggest is attached
to this email.

Cheers,
Matt

[1] https://github.com/multipath-tcp/mptcp_net-next/commit/a95a213e49af
-- 
Tessares | Belgium | Hybrid Access Solutions
www.tessares.net

[-- Attachment #2: a95a213e49afeb23fc8f6ce561366886e31b5692.patch --]
[-- Type: text/x-patch, Size: 730 bytes --]

diff --cc net/wireless/nl80211.c
index 0a31b1d2845d,4f63059efd81..bfa15defc04e
--- a/net/wireless/nl80211.c
+++ b/net/wireless/nl80211.c
@@@ -805,10 -810,8 +810,11 @@@ static const struct nla_policy nl80211_
  	[NL80211_ATTR_MLD_ADDR] = NLA_POLICY_EXACT_LEN(ETH_ALEN),
  	[NL80211_ATTR_MLO_SUPPORT] = { .type = NLA_FLAG },
  	[NL80211_ATTR_MAX_NUM_AKM_SUITES] = { .type = NLA_REJECT },
- 	[NL80211_ATTR_PUNCT_BITMAP] = NLA_POLICY_RANGE(NLA_U8, 0, 0xffff),
+ 	[NL80211_ATTR_PUNCT_BITMAP] =
+ 		NLA_POLICY_FULL_RANGE(NLA_U32, &nl80211_punct_bitmap_range),
 +
 +	[NL80211_ATTR_MAX_HW_TIMESTAMP_PEERS] = { .type = NLA_U16 },
 +	[NL80211_ATTR_HW_TIMESTAMP_ENABLED] = { .type = NLA_FLAG },
  };
  
  /* policy for the key attributes */

Re: pull-request: wireless-2023-03-10: manual merge

[Johannes Berg]

On Mon, 2023-03-13 at 09:04 +0100, Matthieu Baerts wrote:
> FYI, we got a small conflict when merging -net in net-next in the MPTCP
> tree due to this patch applied in -net:
> 
>   b27f07c50a73 ("wifi: nl80211: fix puncturing bitmap policy")
> 
> and this one from net-next:
> 
>   cbbaf2bb829b ("wifi: nl80211: add a command to enable/disable HW
> timestamping")
> 

Right, overlapping changes/additions.

I suspect there isn't much I can do about it at this point, other than
merging wireless into wireless-next and then sending a pull request for
that, but that seems a bit pointless?

Jakub, any preferences?

johannes

Re: pull-request: wireless-2023-03-10: manual merge

[Matthieu Baerts]

Hi Johannes,

On 13/03/2023 10:13, Johannes Berg wrote:
> On Mon, 2023-03-13 at 09:04 +0100, Matthieu Baerts wrote:
>> FYI, we got a small conflict when merging -net in net-next in the MPTCP
>> tree due to this patch applied in -net:
>>
>>   b27f07c50a73 ("wifi: nl80211: fix puncturing bitmap policy")
>>
>> and this one from net-next:
>>
>>   cbbaf2bb829b ("wifi: nl80211: add a command to enable/disable HW
>> timestamping")
>>
> 
> Right, overlapping changes/additions.
> 
> I suspect there isn't much I can do about it at this point, other than
> merging wireless into wireless-next and then sending a pull request for
> that, but that seems a bit pointless?

I should probably update the text I send in case of conflicts, probably
inspired by the ones from Stephen: as you probably know or guess, the
best is to avoid conflicts. If it is not possible, it is good to add a
few words in the pull request to give instructions on how to fix them.

I don't think there is anything else you can do apart from confirming
the merge resolution looks good to you :)

Cheers,
Matt
-- 
Tessares | Belgium | Hybrid Access Solutions
www.tessares.net

Re: pull-request: wireless-2023-03-10: manual merge

[Jakub Kicinski]

On Mon, 13 Mar 2023 14:03:12 +0100 Matthieu Baerts wrote:
> I don't think there is anything else you can do apart from confirming
> the merge resolution looks good to you :)

Yup, don't do anything special, we'll resolve based on what Stephen 
and Matthieu suggest and feed the resolution back to you after your
next PR.