All of lore.kernel.org
 help / color / mirror / Atom feed
From: Marc Kleine-Budde <mkl@pengutronix.de>
To: Jakub Kicinski <kuba@kernel.org>
Cc: netdev@vger.kernel.org, davem@davemloft.net,
	linux-can@vger.kernel.org, kernel@pengutronix.de
Subject: Re: pull-request: can 2021-01-20
Date: Wed, 20 Jan 2021 21:20:13 +0100	[thread overview]
Message-ID: <410e7552-a6bd-d48c-6530-e4b5154687d2@pengutronix.de> (raw)
In-Reply-To: <20210120091955.54a52e09@kicinski-fedora-pc1c0hjn.dhcp.thefacebook.com>


[-- Attachment #1.1: Type: text/plain, Size: 1489 bytes --]

On 1/20/21 6:19 PM, Jakub Kicinski wrote:
>> this is a pull request of 3 patches for net/master.
>>
>> All three patches are by Vincent Mailhol and fix a potential use after free bug
>> in the CAN device infrastructure, the vxcan driver, and the peak_usk driver. In
>> the TX-path the skb is used to read from after it was passed to the networking
>> stack with netif_rx_ni().
> 
> Pulled, thanks.
> 
> Seems like the PR didn't show up in patchwork at all :S Hopefully I can
> still pull reight manually without the scripts :)

Fingers crossed. :D

Today I noticed a lag of >4h on vger.kernel.org. Even this mail of yours hasn't
made it to the linux-can list, yet. It's 3h delayed.

>> Note: Patch 1/3 touches "drivers/net/can/dev.c". In net-next/master this file
>> has been moved to drivers/net/can/dev/dev.c [1] and parts of it have been
>> transfered into separate files. This may result in a merge conflict. Please
>> carry this patch forward, the change is rather simple. Drop us a note if
>> needed. Are any actions needed with regards to linux-next?
> 
> Thanks for the note, I'm sending the PR to Linus now, so I think
> linux-next may never see the the conflict.

thanks,
Marc

-- 
Pengutronix e.K.                 | Marc Kleine-Budde           |
Embedded Linux                   | https://www.pengutronix.de  |
Vertretung West/Dortmund         | Phone: +49-231-2826-924     |
Amtsgericht Hildesheim, HRA 2686 | Fax:   +49-5121-206917-5555 |


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

  reply	other threads:[~2021-01-20 20:22 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-01-20 12:51 pull-request: can 2021-01-20 Marc Kleine-Budde
2021-01-20 12:52 ` [net 1/3] can: dev: can_restart: fix use after free bug Marc Kleine-Budde
2021-01-20 20:40   ` patchwork-bot+netdevbpf
2021-01-20 12:52 ` [net 2/3] can: vxcan: vxcan_xmit: " Marc Kleine-Budde
2021-01-20 12:52 ` [net 3/3] can: peak_usb: fix use after free bugs Marc Kleine-Budde
2021-01-20 17:19 ` pull-request: can 2021-01-20 Jakub Kicinski
2021-01-20 20:20   ` Marc Kleine-Budde [this message]
2021-01-20 20:36     ` Jakub Kicinski
2021-01-20 21:03       ` Marc Kleine-Budde
2021-01-20 20:40 ` patchwork-bot+netdevbpf

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=410e7552-a6bd-d48c-6530-e4b5154687d2@pengutronix.de \
    --to=mkl@pengutronix.de \
    --cc=davem@davemloft.net \
    --cc=kernel@pengutronix.de \
    --cc=kuba@kernel.org \
    --cc=linux-can@vger.kernel.org \
    --cc=netdev@vger.kernel.org \
    /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.