Hi all,
Today's linux-next merge of the net-next tree got a conflict in:
net/mac80211/key.c
between commit:
02e0e426a2fb ("wifi: mac80211: fix error path key leak")
from the wireless tree and commits:
2a8b665e6bcc ("wifi: mac80211: remove key_mtx")
7d6904bf26b9 ("Merge wireless into wireless-next")
from the net-next tree.
I fixed it up (I just used the latter, there may be more needed) 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
Hi,
On Thu, 2023-10-12 at 11:37 +1100, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the net-next tree got a conflict in:
>
> net/mac80211/key.c
>
> between commit:
>
> 02e0e426a2fb ("wifi: mac80211: fix error path key leak")
>
> from the wireless tree and commits:
>
> 2a8b665e6bcc ("wifi: mac80211: remove key_mtx")
> 7d6904bf26b9 ("Merge wireless into wireless-next")
>
> from the net-next tree.
Oops, right, I forgot about that.
> 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.
Thanks,
johannes
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?
Also, there's another direct return without freeing the key in
ieee80211_key_link(), is that one okay ?
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