Received-SPF: pass (google.com: domain of linux-wireless-owner@vger.kernel.org designates 2620:137:e000::3:4 as permitted sender) client-ip=2620:137:e000::3:4;
Message-ID: <007e30c2fe785e2f3fd7ffae9b85b7903f46e48c.camel@sipsolutions.net>
Subject: Re: linux-next: manual merge of the net-next tree with the wireless
 tree
From:   Johannes Berg <johannes@sipsolutions.net>
To:     Jakub Kicinski <kuba@kernel.org>
Cc:     Stephen Rothwell <sfr@canb.auug.org.au>,
        David Miller <davem@davemloft.net>,
        Paolo Abeni <pabeni@redhat.com>, Kalle Valo <kvalo@kernel.org>,
        Networking <netdev@vger.kernel.org>,
        Wireless <linux-wireless@vger.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>
Date:   Fri, 20 Oct 2023 07:49:27 +0200
In-Reply-To: <20231019144004.0f5b2533@kernel.org>
References: <20231012113648.46eea5ec@canb.auug.org.au>
         <987ecad0840a9d15bd844184ea595aff1f3b9c0c.camel@sipsolutions.net>
         <20231019144004.0f5b2533@kernel.org>
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable
User-Agent: Evolution 3.48.4 (3.48.4-1.fc38) 
MIME-Version: 1.0
Precedence: bulk

On Thu, 2023-10-19 at 14:40 -0700, Jakub Kicinski wrote:
> On Thu, 12 Oct 2023 10:10:10 +0200 Johannes Berg wrote:
> > > I fixed it up (I just used the latter, there may be more needed) =20
> >=20
> > Just using net-next/wireless-next is fine, I actually noticed the issue
> > while I was merging the trees to fix the previous conflicts here.
>=20
> Resolved the conflict in 041c3466f39d, could you double check?

I don't see anything there, but I guess that means it's good? Code looks
fine.

> Also, there's another direct return without freeing the key in
> ieee80211_key_link(), is that one okay ?

*sigh*

No, it's not. I think that means I resolved the previous merge there
incorrectly, because it's OK in wireless and broken in wireless-next,
and it had been fixed in d097ae01ebd4 ("wifi: mac80211: fix potential
key leak").

Anyway, thanks for checking and noticing! Will fix.

johannes