From patchwork Tue Sep 26 02:20:09 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 144711 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:cae8:0:b0:403:3b70:6f57 with SMTP id r8csp1663541vqu; Mon, 25 Sep 2023 21:24:57 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHkGSZctZXMkpmO52bT08agYwfUCcyW36JVDW4qd+B3199S7XWmiVC/BX5jl//VGGgKNs8b X-Received: by 2002:a17:90b:d89:b0:277:3569:2a05 with SMTP id bg9-20020a17090b0d8900b0027735692a05mr6243234pjb.27.1695702297225; Mon, 25 Sep 2023 21:24:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1695702297; cv=none; d=google.com; s=arc-20160816; b=rl4Yf28ALHSE8X+k3ouf3JEiEJlovvnekS8NGQinRCFljH2PCaVGb/3NIHWMFTTmAb ARd1pkDVGVP53BTrZEN9/OEnqbX6USG3sNNCVzWcefOrQ0fIhJBmNMzT0HWmPDPg7epC jtP9h4qQBFvtYQiDbY/B7G747EnXM5s5sYDZV29ta9prxY+Dayl1TairCcfxQIQafJW3 3M0W+X4yTqBHAZiHiK0YolwkQlNX3Nx0J8qrJvWahTgP02TEnWWzcQ41W7+GaGakqR3b vhO0eABjuPcFA6o0XbZq5Cv966lee/zFgh9JUKNmT1UVCl39keVYqFPDXFelavGqje+h FtdQ== 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=TcPGSxwt9MInQj/celUnubsm5b1vkF3Gs12n9nTNg+c=; fh=YSlvpPL42+OV5bLFCL+NbyjIvOHCcshrxbzBHge5Zrw=; b=0Hgh1K5wkVTXFJdxvXCnCggIE9d5rjCaJuXvRYxBlbGnfEoeCawTNnl3enH1HgVMWG zektwLNfwfMvm7i/GMbJha7c6wIsViqepdVsgyvvzA1bAOswsC9Js4hGXNRaRiUcgbYw s13zqvrPQVG1jrU06CA1CYKLWKzi63zC4TQFxW5WI+sBF1Cs3+UY1ZepkOntPOgz90BZ LboPFJ0Ch5aU2OqVdAHdiFDOY21GBXmksaMhKxLVC8f3eZJAyZ4xwZ6UicTu7yk6QmwI 5tiKwJqx7r0bo6bzEM584Q88HIC0hdQ9+P+fv3AybT/V+Av2vampEnm2ZwwGOEgIKjku y61A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=e9xdnIuv; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:4 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 howler.vger.email (howler.vger.email. [2620:137:e000::3:4]) by mx.google.com with ESMTPS id rj4-20020a17090b3e8400b002766354b7b2si1541189pjb.153.2023.09.25.21.24.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 25 Sep 2023 21:24:57 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:4 as permitted sender) client-ip=2620:137:e000::3:4; Authentication-Results: mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=e9xdnIuv; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:4 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 (depot.vger.email [IPv6:2620:137:e000::3:0]) by howler.vger.email (Postfix) with ESMTP id 5FB42833CE2F; Mon, 25 Sep 2023 19:20:32 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at howler.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233381AbjIZCU0 (ORCPT + 27 others); Mon, 25 Sep 2023 22:20:26 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52206 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229501AbjIZCUY (ORCPT ); Mon, 25 Sep 2023 22:20:24 -0400 Received: from gandalf.ozlabs.org (mail.ozlabs.org [IPv6:2404:9400:2221:ea00::3]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9B577BF; Mon, 25 Sep 2023 19:20:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1695694811; bh=TcPGSxwt9MInQj/celUnubsm5b1vkF3Gs12n9nTNg+c=; h=Date:From:To:Cc:Subject:From; b=e9xdnIuv+S5IexeCO7HdwPtekTa9fEYqE+2bQnMadh1ivXxvgDwpv6gXZ6ENQg+OG ncOiQyjwezbh3KJUO1sY8CrLaQsprvYpudhZHQ/lvinoN/ywcvay6Xn9Ex+0ikrJ7U WFOYqcuy2RAHeVb6wHa5ybX5ti0YZSqOPrCqG46d3C+aMVyDqOMgHNrjl8ETiz2Dc6 BBJ0s/NCk5Q/H8OOPfGo3KYn0syGAWzIDz1f8EVAZhHu3UDXiEmpr0jQfhrSTBPn9h C0rkYSY4uNqoZBHsY7ZaMciVQeYGJy75hsGzlxp9NKRq4gwChcmIsg/Fvd4mAg0mZg ZY/2fIn8NMVWw== 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 (prime256v1) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.ozlabs.org (Postfix) with ESMTPSA id 4Rvk3b0wJwz4xPR; Tue, 26 Sep 2023 12:20:11 +1000 (AEST) Date: Tue, 26 Sep 2023 12:20:09 +1000 From: Stephen Rothwell To: Kalle Valo , Johannes Berg , Wireless Cc: Johannes Berg , Linux Kernel Mailing List , Linux Next Mailing List Subject: linux-next: manual merge of the wireless-next tree with the wireless tree Message-ID: <20230926122009.67735060@canb.auug.org.au> MIME-Version: 1.0 X-Spam-Status: No, score=-4.3 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,RCVD_IN_DNSWL_MED,SPF_HELO_PASS,SPF_PASS autolearn=ham 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: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (howler.vger.email [0.0.0.0]); Mon, 25 Sep 2023 19:20:32 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1778063854608668204 X-GMAIL-MSGID: 1778072732122904007 Hi all, Today's linux-next merge of the wireless-next tree got a conflict in: net/mac80211/key.c between commits: 31db78a4923e ("wifi: mac80211: fix potential key use-after-free") d097ae01ebd4 ("wifi: mac80211: fix potential key leak") from the wireless tree and commit: 2a8b665e6bcc ("wifi: mac80211: remove key_mtx") from the wireless-next tree. I fixed it up (I think - 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. diff --cc net/mac80211/key.c index 0665ff5e456e,ac410f6632b5..000000000000 --- a/net/mac80211/key.c