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

[Matthieu Baerts <matthieu.baerts@tessares.net>]

[-- 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 */