lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
Open Source and information security mailing list archives
| ||
|
Message-ID: <007e30c2fe785e2f3fd7ffae9b85b7903f46e48c.camel@sipsolutions.net> Date: Fri, 20 Oct 2023 07:49:27 +0200 From: Johannes Berg <johannes@...solutions.net> To: Jakub Kicinski <kuba@...nel.org> Cc: Stephen Rothwell <sfr@...b.auug.org.au>, David Miller <davem@...emloft.net>, Paolo Abeni <pabeni@...hat.com>, Kalle Valo <kvalo@...nel.org>, Networking <netdev@...r.kernel.org>, Wireless <linux-wireless@...r.kernel.org>, Linux Kernel Mailing List <linux-kernel@...r.kernel.org>, Linux Next Mailing List <linux-next@...r.kernel.org> Subject: Re: linux-next: manual merge of the net-next tree with the wireless tree 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) > > > > 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. > > 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
Powered by blists - more mailing lists