All of lore.kernel.org
 help / color / mirror / Atom feed
From: Jakub Kicinski <kuba@kernel.org>
To: Oliver Hartkopp <socketcan@hartkopp.net>
Cc: Marc Kleine-Budde <mkl@pengutronix.de>,
	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 11:33:56 -0700	[thread overview]
Message-ID: <20220316113356.6bee9428@kicinski-fedora-pc1c0hjn.dhcp.thefacebook.com> (raw)
In-Reply-To: <ec2adb66-2199-2f9d-15ce-6641562c54f2@hartkopp.net>

On Wed, 16 Mar 2022 09:42:14 +0100 Oliver Hartkopp wrote:
> > 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.

No strong preference in this particular case, -rc9 is very unlikely 
so won't be much difference between it getting merge to net or net-next.

If you don't have a preference either let's got with the usual process
and send the patch to net, just share the conflict resolution and we
can deal with it.

  parent reply	other threads:[~2022-03-16 18:34 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
2022-03-16 16:49             ` Oliver Hartkopp
2022-03-16 20:51               ` Marc Kleine-Budde
2022-03-16 18:33             ` Jakub Kicinski [this message]
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=20220316113356.6bee9428@kicinski-fedora-pc1c0hjn.dhcp.thefacebook.com \
    --to=kuba@kernel.org \
    --cc=linux-can@vger.kernel.org \
    --cc=mkl@pengutronix.de \
    --cc=netdev@vger.kernel.org \
    --cc=socketcan@hartkopp.net \
    --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.