From: Marc Kleine-Budde <mkl@pengutronix.de>
To: netdev@vger.kernel.org
Cc: davem@davemloft.net, kuba@kernel.org, linux-can@vger.kernel.org,
kernel@pengutronix.de
Subject: pull-request: can 2021-01-20
Date: Wed, 20 Jan 2021 13:51:59 +0100 [thread overview]
Message-ID: <20210120125202.2187358-1-mkl@pengutronix.de> (raw)
Hello Jakub, hello David,
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().
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?
[1] 3e77f70e7345 can: dev: move driver related infrastructure into separate subdir
regards,
Marc
---
The following changes since commit 9c30ae8398b0813e237bde387d67a7f74ab2db2d:
tcp: fix TCP socket rehash stats mis-accounting (2021-01-19 19:47:20 -0800)
are available in the Git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can.git tags/linux-can-fixes-for-5.11-20210120
for you to fetch changes up to 50aca891d7a554db0901b245167cd653d73aaa71:
can: peak_usb: fix use after free bugs (2021-01-20 13:33:28 +0100)
----------------------------------------------------------------
linux-can-fixes-for-5.11-20210120
----------------------------------------------------------------
Vincent Mailhol (3):
can: dev: can_restart: fix use after free bug
can: vxcan: vxcan_xmit: fix use after free bug
can: peak_usb: fix use after free bugs
drivers/net/can/dev.c | 4 ++--
drivers/net/can/usb/peak_usb/pcan_usb_fd.c | 8 ++++----
drivers/net/can/vxcan.c | 6 ++++--
3 files changed, 10 insertions(+), 8 deletions(-)
next reply other threads:[~2021-01-20 20:13 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-20 12:51 Marc Kleine-Budde [this message]
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
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=20210120125202.2187358-1-mkl@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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).