[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <ec2adb66-2199-2f9d-15ce-6641562c54f2@hartkopp.net>
Date: Wed, 16 Mar 2022 09:42:14 +0100
From: Oliver Hartkopp <socketcan@...tkopp.net>
To: Marc Kleine-Budde <mkl@...gutronix.de>
Cc: Jakub Kicinski <kuba@...nel.org>, netdev@...r.kernel.org,
syzbot+2339c27f5c66c652843e@...kaller.appspotmail.com,
linux-can <linux-can@...r.kernel.org>
Subject: Re: [net-next] can: isotp: sanitize CAN ID checks in isotp_bind()
On 16.03.22 09:01, Marc Kleine-Budde wrote:
> On 16.03.2022 08:53:54, Oliver Hartkopp wrote:
>>> Should this go into net/master with stable on Cc or to net-next?
>>
>> This patch is for net-next as it won't apply to net/master nor the
>> stable trees due to the recent changes in net-next.
>>
>> As it contains a Fixes: tag I would send the patch for the stable
>> trees when the patch hits Linus' tree and likely Greg would show up
>> asking for it.
>>
>> I hope that's the most elegant process here?!?
>
> Another option is to port the patch to net/master with the hope that
> back porting is easier.
I have a patch here for net/master that also properly applies down to
linux-5.10.y
If requested I could post it instantly.
> Then talk to Jakub and David about the merge
> conflict when net/master is merged to net-next/master.
Yes. There will be a merge conflict. Therefore I thought bringing that
patch for the released 5.17 and the stable trees later would be less
effort for Jakub and David.
Best regards.
Oliver
Powered by blists - more mailing lists