Merge tag 'linux-can-fixes-for-5.18-20220331' of...
Merge tag 'linux-can-fixes-for-5.18-20220331' of git://git.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can Marc Kleine-Budde says: ==================== pull-request: can 2022-03-31 The first patch is by Oliver Hartkopp and fixes MSG_PEEK feature in the CAN ISOTP protocol (broken in net-next for v5.18 only). Tom Rix's patch for the mcp251xfd driver fixes the propagation of an error value in case of an error. A patch by me for the m_can driver fixes a use-after-free in the xmit handler for m_can IP cores v3.0.x. Hangyu Hua contributes 3 patches fixing the same double free in the error path of the xmit handler in the ems_usb, usb_8dev and mcba_usb USB CAN driver. Pavel Skripkin contributes a patch for the mcba_usb driver to properly check the endpoint type. The last patch is by me and fixes a mem leak in the gs_usb, which was introduced in net-next for v5.18. * tag 'linux-can-fixes-for-5.18-20220331' of git://git.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can: can: gs_usb: gs_make_candev(): fix memory leak for devices with extended bit timing configuration can: mcba_usb: properly check endpoint type can: mcba_usb: mcba_usb_start_xmit(): fix double dev_kfree_skb in error path can: usb_8dev: usb_8dev_start_xmit(): fix double dev_kfree_skb() in error path can: ems_usb: ems_usb_start_xmit(): fix double dev_kfree_skb() in error path can: m_can: m_can_tx_handler(): fix use after free of skb can: mcp251xfd: mcp251xfd_register_get_dev_id(): fix return of error value can: isotp: restore accidentally removed MSG_PEEK feature ==================== Link: https://lore.kernel.org/r/ Signed-off-by:Jakub Kicinski <kuba@kernel.org>
Showing
- drivers/net/can/m_can/m_can.c 3 additions, 2 deletionsdrivers/net/can/m_can/m_can.c
- drivers/net/can/spi/mcp251xfd/mcp251xfd-core.c 1 addition, 1 deletiondrivers/net/can/spi/mcp251xfd/mcp251xfd-core.c
- drivers/net/can/usb/ems_usb.c 0 additions, 1 deletiondrivers/net/can/usb/ems_usb.c
- drivers/net/can/usb/gs_usb.c 2 additions, 0 deletionsdrivers/net/can/usb/gs_usb.c
- drivers/net/can/usb/mcba_usb.c 16 additions, 11 deletionsdrivers/net/can/usb/mcba_usb.c
- drivers/net/can/usb/usb_8dev.c 14 additions, 16 deletionsdrivers/net/can/usb/usb_8dev.c
- net/can/isotp.c 1 addition, 1 deletionnet/can/isotp.c
Please register or sign in to comment