Message ID | 20230331104959.0b30604d@canb.auug.org.au |
---|---|
State | New |
Headers |
Return-Path: <linux-kernel-owner@vger.kernel.org> Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp226570vqo; Thu, 30 Mar 2023 17:27:56 -0700 (PDT) X-Google-Smtp-Source: AKy350bJAReY3Kf1Fs1fyxCFj0wIz2pDlIqzX3aiOGjM/mS5vREbnDESTzqZlVLlW4Dh0XPmYUsY X-Received: by 2002:a17:90b:4ac8:b0:23f:91e5:103d with SMTP id mh8-20020a17090b4ac800b0023f91e5103dmr27209346pjb.36.1680222475888; Thu, 30 Mar 2023 17:27:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1680222475; cv=none; d=google.com; s=arc-20160816; b=lLWZ56RxIo/z+M1ijWfQcQhykVIy/GCvWoWxKgKST5Y4u44VaDc6GKkhOEAPtmiWvE Hqed8DoycewyLopwU+fug/b87dO4Ilpgqdfq7LA6Du9dt+q5sAfWimQdAHIcvcjERk3l RSqUCtKTIKSV4m81QZWOgzX422QmULu/kHPyyDse1qjm0m87c7inPqXq+FQ/+JC+06o+ jmtsJOoGYaG+eehoht+X0/Fhw7j4/tx3AKE530PAlNTRY79b1qzk1G7hA2SM+H0DviAf kYiqTtwUKaDk3HN0lbh/4/1d5rGWlxD7pbr17GadidvL5bMyr+zxvtX37dbqtkW0BCsA 4J9Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:mime-version:message-id:subject:cc:to:from:date :dkim-signature; bh=rCPjUHBP/pV9Uau0ptAEaLCUF3D9Ml3/OGmrv28mF4g=; b=kJADd2ZG+goR54M9OYm0IdGg4WYpYjMM08MRUCmmpJH46ag7TjTVhjTQwgifTd3024 qjxlrGEEVU+JsT7OLDE4LXX6ZhgGwaCGblZRUE3V+30spWpagnaBUa7mV1c8yfPvLiXp AR1c1t2Z5qo6Q8JC9pYd3PlMNq1lNWq9Wv6DhMqCnKYk+OG01OBO542oXeouEqn2Qgi6 zw+SM1hDm0/ZO+6e/s76Ow5iEvqRaTvwhq33WvemOsdwKx+GtdmONGwUacLPDlcYJMLT ZJmRJdb789G8wvFPZ4GU+L3lEfE3mh8dEbwOKq2pQFZYZfThIV8p3LOrbuYGbnmchEIX EdyA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=S0ABsE+r; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=canb.auug.org.au Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id lh12-20020a170903290c00b001a2513b8e14si760211plb.84.2023.03.30.17.27.43; Thu, 30 Mar 2023 17:27:55 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=S0ABsE+r; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=canb.auug.org.au Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231750AbjC3Xuk (ORCPT <rfc822;rua109.linux@gmail.com> + 99 others); Thu, 30 Mar 2023 19:50:40 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45146 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231752AbjC3XuV (ORCPT <rfc822;linux-kernel@vger.kernel.org>); Thu, 30 Mar 2023 19:50:21 -0400 Received: from gandalf.ozlabs.org (gandalf.ozlabs.org [150.107.74.76]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 332CA12CFD; Thu, 30 Mar 2023 16:50:08 -0700 (PDT) Received: from authenticated.ozlabs.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.ozlabs.org (Postfix) with ESMTPSA id 4PngBx54V5z4x1R; Fri, 31 Mar 2023 10:50:01 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1680220204; bh=rCPjUHBP/pV9Uau0ptAEaLCUF3D9Ml3/OGmrv28mF4g=; h=Date:From:To:Cc:Subject:From; b=S0ABsE+rmZ0++GhOZmrtmLwI8G76LtysR3QpaeEi92LTIh4SUJh1rwpwvJMCKOI7q lDQQe7YbEXwImSz6IZpwH1ma9/Au4G4Z2BypT6ujcFzuOEX2G/9NHz6/DCfGrEbi+Q A64GlyIb1Gzwwgw6aL5JnwOiN68JhmaJMvufvGaFAgUA8VBgRg+j+9a/PDIy3+OLKh Y8kqUNyMSVTPIWCaJ62uwHb+CMmKme6MdTPVw3wNEH385RX6/V9bHe6GkWPhfTHyff AWut5xijCh7NTYmR/hEK31y5k5zCAv5xIcqWhnwvs/V21STxBS5QWF+M2/CnFFZKeh w5NAcv7nfHOSQ== Date: Fri, 31 Mar 2023 10:49:59 +1100 From: Stephen Rothwell <sfr@canb.auug.org.au> To: Kalle Valo <kvalo@kernel.org>, Johannes Berg <johannes@sipsolutions.net> Cc: Wireless <linux-wireless@vger.kernel.org>, Felix Fietkau <nbd@nbd.name>, Johannes Berg <johannes.berg@intel.com>, Linux Kernel Mailing List <linux-kernel@vger.kernel.org>, Linux Next Mailing List <linux-next@vger.kernel.org>, Ryder Lee <ryder.lee@mediatek.com> Subject: linux-next: manual merge of the wireless-next tree with the wireless tree Message-ID: <20230331104959.0b30604d@canb.auug.org.au> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_/Z75pzBwRDy.ne14p3qRShtd"; protocol="application/pgp-signature"; micalg=pgp-sha256 X-Spam-Status: No, score=-0.1 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,SPF_HELO_PASS,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: <linux-kernel.vger.kernel.org> X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1761840963241024538?= X-GMAIL-MSGID: =?utf-8?q?1761840963241024538?= |
Series |
linux-next: manual merge of the wireless-next tree with the wireless tree
|
|
Commit Message
Stephen Rothwell
March 30, 2023, 11:49 p.m. UTC
Hi all, Today's linux-next merge of the wireless-next tree got a conflict in: net/mac80211/rx.c between commit: a16fc38315f2 ("wifi: mac80211: fix potential null pointer dereference") from the wireless tree and commit: fe4a6d2db3ba ("wifi: mac80211: implement support for yet another mesh A-MSDU format") from the wireless-next tree. I fixed it up (see below) and can carry the fix as necessary. This is now fixed as far as linux-next is concerned, but any non trivial conflicts should be mentioned to your upstream maintainer when your tree is submitted for merging. You may also want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts.
Comments
On Fri, 2023-03-31 at 10:49 +1100, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the wireless-next tree got a conflict in: > > net/mac80211/rx.c > > between commit: > > a16fc38315f2 ("wifi: mac80211: fix potential null pointer dereference") > > from the wireless tree and commit: > > fe4a6d2db3ba ("wifi: mac80211: implement support for yet another mesh A-MSDU format") > > from the wireless-next tree. Thanks for the heads-up. I sort of expected this, but didn't want to do a merge or wireless into wireless-next before it was pulled, maybe I should've staggered the pull requests, but you would've seen the merge issue anyway. Anyway, I've now pulled wireless into wireless-next, so you might continue seeing this issue (*) if you merge net/net-next before merging wireless-next, but it'll be completely resolved when we send the next pull request to net-next (next week). Thanks! (*) and another one in nl80211 policy, I think? joahnnes
Hi all, On Fri, 31 Mar 2023 10:49:59 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote: > > Today's linux-next merge of the wireless-next tree got a conflict in: > > net/mac80211/rx.c > > between commit: > > a16fc38315f2 ("wifi: mac80211: fix potential null pointer dereference") > > from the wireless tree and commit: > > fe4a6d2db3ba ("wifi: mac80211: implement support for yet another mesh A-MSDU format") > > from the wireless-next tree. > > I fixed it up (see below) and can carry the fix as necessary. This > is now fixed as far as linux-next is concerned, but any non trivial > conflicts should be mentioned to your upstream maintainer when your tree > is submitted for merging. You may also want to consider cooperating > with the maintainer of the conflicting tree to minimise any particularly > complex conflicts. > > -- > Cheers, > Stephen Rothwell > > diff --cc net/mac80211/rx.c > index 3e2176a730e6,1c957194554b..000000000000 > --- a/net/mac80211/rx.c > +++ b/net/mac80211/rx.c > @@@ -2776,27 -2862,12 +2843,31 @@@ ieee80211_rx_mesh_data(struct ieee80211 > rcu_read_unlock(); > } > > + /* Frame has reached destination. Don't forward */ > + if (ether_addr_equal(sdata->vif.addr, eth->h_dest)) > + goto rx_accept; > + > + if (!--mesh_hdr->ttl) { > + if (multicast) > + goto rx_accept; > + > + IEEE80211_IFSTA_MESH_CTR_INC(ifmsh, dropped_frames_ttl); > + return RX_DROP_MONITOR; > + } > + > + if (!ifmsh->mshcfg.dot11MeshForwarding) { > + if (is_multicast_ether_addr(eth->h_dest)) > + goto rx_accept; > + > + return RX_DROP_MONITOR; > + } > + > skb_set_queue_mapping(skb, ieee802_1d_to_ac[skb->priority]); > > + if (!multicast && > + ieee80211_rx_mesh_fast_forward(sdata, skb, mesh_hdrlen)) > + return RX_QUEUED; > + > ieee80211_fill_mesh_addresses(&hdr, &hdr.frame_control, > eth->h_dest, eth->h_source); > hdrlen = ieee80211_hdrlen(hdr.frame_control); > @@@ -2914,14 -2982,24 +2985,24 @@@ __ieee80211_rx_h_amsdu(struct ieee80211 > data_offset, true)) > return RX_DROP_UNUSABLE; > > - if (rx->sta && rx->sta->amsdu_mesh_control < 0) { > + if (rx->sta->amsdu_mesh_control < 0) { > - bool valid_std = ieee80211_is_valid_amsdu(skb, true); > - bool valid_nonstd = ieee80211_is_valid_amsdu(skb, false); > + s8 valid = -1; > + int i; > + > + for (i = 0; i <= 2; i++) { > + if (!ieee80211_is_valid_amsdu(skb, i)) > + continue; > + > + if (valid >= 0) { > + /* ambiguous */ > + valid = -1; > + break; > + } > > - if (valid_std && !valid_nonstd) > - rx->sta->amsdu_mesh_control = 1; > - else if (valid_nonstd && !valid_std) > - rx->sta->amsdu_mesh_control = 0; > + valid = i; > + } > + > + rx->sta->amsdu_mesh_control = valid; > } > > ieee80211_amsdu_to_8023s(skb, &frame_list, dev->dev_addr, This is now a conflict between the net-next and net trees.
Stephen Rothwell <sfr@canb.auug.org.au> writes: > Hi all, > > On Fri, 31 Mar 2023 10:49:59 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote: >> >> Today's linux-next merge of the wireless-next tree got a conflict in: >> >> net/mac80211/rx.c >> >> between commit: >> >> a16fc38315f2 ("wifi: mac80211: fix potential null pointer dereference") >> >> from the wireless tree and commit: >> >> fe4a6d2db3ba ("wifi: mac80211: implement support for yet another mesh A-MSDU format") >> >> from the wireless-next tree. >> >> I fixed it up (see below) and can carry the fix as necessary. This >> is now fixed as far as linux-next is concerned, but any non trivial >> conflicts should be mentioned to your upstream maintainer when your tree >> is submitted for merging. You may also want to consider cooperating >> with the maintainer of the conflicting tree to minimise any particularly >> complex conflicts. [...] > This is now a conflict between the net-next and net trees. My plan is to submit wireless-next pull request to net-next by Wednesday, that should fix the conflict.
diff --cc net/mac80211/rx.c index 3e2176a730e6,1c957194554b..000000000000 --- a/net/mac80211/rx.c