| Message ID | 20211017210142.2108610-1-mkl@pengutronix.de (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | bca69044affa6bb1be38e91bbd9de99ba11aee76 |
| Headers | show |
| Series | pull-request: can 2021-10-17 | expand |
| Context | Check | Description |
|---|---|---|
| netdev/tree_selection | success | Series ignored based on subject |
Hello: This pull request was applied to netdev/net.git (master) by Marc Kleine-Budde <mkl@pengutronix.de>: On Sun, 17 Oct 2021 23:01:31 +0200 you wrote: > Hello Jakub, hello David, > > this is a pull request of 11 patches for net/master. > > The first 4 patches are by Ziyang Xuan and Zhang Changzhong and fix 1 > use after free and 3 standard conformance problems in the j1939 CAN > stack. > > [...] Here is the summary with links: - pull-request: can 2021-10-17 https://git.kernel.org/netdev/net/c/bca69044affa - [net,02/11] can: j1939: j1939_netdev_start(): fix UAF for rx_kref of j1939_priv https://git.kernel.org/netdev/net/c/d9d52a3ebd28 - [net,03/11] can: j1939: j1939_xtp_rx_dat_one(): cancel session if receive TP.DT with error length https://git.kernel.org/netdev/net/c/379743985ab6 - [net,04/11] can: j1939: j1939_xtp_rx_rts_session_new(): abort TP less than 9 bytes https://git.kernel.org/netdev/net/c/a4fbe70c5cb7 - [net,05/11] can: isotp: isotp_sendmsg(): add result check for wait_event_interruptible() https://git.kernel.org/netdev/net/c/9acf636215a6 - [net,06/11] can: isotp: isotp_sendmsg(): fix TX buffer concurrent access in isotp_sendmsg() https://git.kernel.org/netdev/net/c/43a08c3bdac4 - [net,07/11] can: rcar_can: fix suspend/resume https://git.kernel.org/netdev/net/c/f7c05c3987dc - [net,08/11] can: m_can: fix iomap_read_fifo() and iomap_write_fifo() https://git.kernel.org/netdev/net/c/99d173fbe894 - [net,09/11] can: peak_pci: peak_pci_remove(): fix UAF https://git.kernel.org/netdev/net/c/949fe9b35570 - [net,10/11] can: peak_usb: pcan_usb_fd_decode_status(): fix back to ERROR_ACTIVE state notification https://git.kernel.org/netdev/net/c/3d031abc7e72 - [net,11/11] can: peak_usb: pcan_usb_fd_decode_status(): remove unnecessary test on the nullity of a pointer https://git.kernel.org/netdev/net/c/553715feaa9e You are awesome, thank you! -- Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html
Hello Jakub, hello David, this is a pull request of 11 patches for net/master. The first 4 patches are by Ziyang Xuan and Zhang Changzhong and fix 1 use after free and 3 standard conformance problems in the j1939 CAN stack. The next 2 patches are by Ziyang Xuan and fix 2 concurrency problems in the ISOTP CAN stack. Yoshihiro Shimoda's patch for the rcar_can fix suspend/resume on not running CAN interfaces. Aswath Govindraju's patch for the m_can driver fixes access for MMIO devices. Zheyu Ma contributes a patch for the peak_pci driver to fix a use after free. Stephane Grosjean's 2 patches fix CAN error state handling in the peak_usb driver. regards, Marc --- The following changes since commit fac3cb82a54a4b7c49c932f96ef196cf5774344c: net: bridge: mcast: use multicast_membership_interval for IGMPv3 (2021-10-16 15:05:58 +0100) 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.15-20211017 for you to fetch changes up to 553715feaa9e0453bc59f6ba20e1c69346888bd5: can: peak_usb: pcan_usb_fd_decode_status(): remove unnecessary test on the nullity of a pointer (2021-10-17 22:51:51 +0200) ---------------------------------------------------------------- linux-can-fixes-for-5.15-20211017 ---------------------------------------------------------------- Aswath Govindraju (1): can: m_can: fix iomap_read_fifo() and iomap_write_fifo() Stephane Grosjean (2): can: peak_usb: pcan_usb_fd_decode_status(): fix back to ERROR_ACTIVE state notification can: peak_usb: pcan_usb_fd_decode_status(): remove unnecessary test on the nullity of a pointer Yoshihiro Shimoda (1): can: rcar_can: fix suspend/resume Zhang Changzhong (2): can: j1939: j1939_xtp_rx_dat_one(): cancel session if receive TP.DT with error length can: j1939: j1939_xtp_rx_rts_session_new(): abort TP less than 9 bytes Zheyu Ma (1): can: peak_pci: peak_pci_remove(): fix UAF Ziyang Xuan (4): can: j1939: j1939_tp_rxtimer(): fix errant alert in j1939_tp_rxtimer can: j1939: j1939_netdev_start(): fix UAF for rx_kref of j1939_priv can: isotp: isotp_sendmsg(): add result check for wait_event_interruptible() can: isotp: isotp_sendmsg(): fix TX buffer concurrent access in isotp_sendmsg() drivers/net/can/m_can/m_can_platform.c | 14 +++++++-- drivers/net/can/rcar/rcar_can.c | 20 ++++++++----- drivers/net/can/sja1000/peak_pci.c | 9 +++--- drivers/net/can/usb/peak_usb/pcan_usb_fd.c | 8 ++--- net/can/isotp.c | 48 ++++++++++++++++++++---------- net/can/j1939/j1939-priv.h | 1 + net/can/j1939/main.c | 7 +++-- net/can/j1939/transport.c | 14 +++++---- 8 files changed, 79 insertions(+), 42 deletions(-)