From: Oliver Hartkopp <socketcan@hartkopp.net>
To: Marc Kleine-Budde <mkl@pengutronix.de>
Cc: Jakub Kicinski <kuba@kernel.org>,
netdev@vger.kernel.org,
syzbot+2339c27f5c66c652843e@syzkaller.appspotmail.com,
linux-can <linux-can@vger.kernel.org>
Subject: Re: [net-next] can: isotp: sanitize CAN ID checks in isotp_bind()
Date: Wed, 16 Mar 2022 09:42:14 +0100 [thread overview]
Message-ID: <ec2adb66-2199-2f9d-15ce-6641562c54f2@hartkopp.net> (raw)
In-Reply-To: <20220316080111.s2hlj6krlzcroxh6@pengutronix.de>
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
next prev parent reply other threads:[~2022-03-16 8:42 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-03-15 20:37 [net-next] can: isotp: sanitize CAN ID checks in isotp_bind() Oliver Hartkopp
2022-03-16 1:51 ` Jakub Kicinski
2022-03-16 7:35 ` Oliver Hartkopp
2022-03-16 7:48 ` Marc Kleine-Budde
2022-03-16 7:53 ` Oliver Hartkopp
2022-03-16 8:01 ` Marc Kleine-Budde
2022-03-16 8:42 ` Oliver Hartkopp [this message]
2022-03-16 16:49 ` Oliver Hartkopp
2022-03-16 20:51 ` Marc Kleine-Budde
2022-03-16 18:33 ` Jakub Kicinski
2022-03-16 18:29 ` Jakub Kicinski
2022-03-16 7:45 ` Marc Kleine-Budde
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=ec2adb66-2199-2f9d-15ce-6641562c54f2@hartkopp.net \
--to=socketcan@hartkopp.net \
--cc=kuba@kernel.org \
--cc=linux-can@vger.kernel.org \
--cc=mkl@pengutronix.de \
--cc=netdev@vger.kernel.org \
--cc=syzbot+2339c27f5c66c652843e@syzkaller.appspotmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.