| Message ID | 20220331084634.869744-1-mkl@pengutronix.de (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 46b556205dcead1ec180329b771c2593d81c6b9b |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | [net,0/n] pull-request: can 2022-03-31 | expand |
| Context | Check | Description |
|---|---|---|
| netdev/tree_selection | success | Clearly marked for net |
| netdev/apply | fail | Patch does not apply to net |
On Thu, 31 Mar 2022 10:46:26 +0200 Marc Kleine-Budde wrote: > 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. I think patchwork did not like the "0/n" in the subject :(
On 31.03.2022 08:42:23, Jakub Kicinski wrote: > On Thu, 31 Mar 2022 10:46:26 +0200 Marc Kleine-Budde wrote: > > 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. > > I think patchwork did not like the "0/n" in the subject :( Should I resend (with a fixed subject)? Marc
Hello: This pull request was applied to netdev/net.git (master) by Marc Kleine-Budde <mkl@pengutronix.de>: On Thu, 31 Mar 2022 10:46:26 +0200 you wrote: > Hello Jakub, hello David, > > this is a pull request of 8 patches for net/master. > > 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). > > [...] Here is the summary with links: - [net,0/n] pull-request: can 2022-03-31 https://git.kernel.org/netdev/net/c/46b556205dce - [net,2/8] can: mcp251xfd: mcp251xfd_register_get_dev_id(): fix return of error value https://git.kernel.org/netdev/net/c/fa7b514d2b28 - [net,3/8] can: m_can: m_can_tx_handler(): fix use after free of skb https://git.kernel.org/netdev/net/c/2e8e79c416aa - [net,4/8] can: ems_usb: ems_usb_start_xmit(): fix double dev_kfree_skb() in error path https://git.kernel.org/netdev/net/c/c70222752228 - [net,5/8] can: usb_8dev: usb_8dev_start_xmit(): fix double dev_kfree_skb() in error path https://git.kernel.org/netdev/net/c/3d3925ff6433 - [net,6/8] can: mcba_usb: mcba_usb_start_xmit(): fix double dev_kfree_skb in error path https://git.kernel.org/netdev/net/c/04c9b00ba835 - [net,7/8] can: mcba_usb: properly check endpoint type https://git.kernel.org/netdev/net/c/136bed0bfd3b - [net,8/8] can: gs_usb: gs_make_candev(): fix memory leak for devices with extended bit timing configuration https://git.kernel.org/netdev/net/c/50d34a0d151d You are awesome, thank you!
On Thu, 31 Mar 2022 17:45:49 +0200 Marc Kleine-Budde wrote: > > I think patchwork did not like the "0/n" in the subject :( > > Should I resend (with a fixed subject)? I should have clarified that :) It's okay - I had to build test manually before sending the PR to Linus, anyway. Looks clean.
Hello Jakub, hello David, this is a pull request of 8 patches for net/master. 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. regards, Marc --- The following changes since commit f9512d654f62604664251dedd437a22fe484974a: net: sparx5: uses, depends on BRIDGE or !BRIDGE (2022-03-30 19:16:27 -0700) 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.18-20220331 for you to fetch changes up to 50d34a0d151dc7abbdbec781bd7f09f2b3cbf01a: can: gs_usb: gs_make_candev(): fix memory leak for devices with extended bit timing configuration (2022-03-31 09:55:27 +0200) ---------------------------------------------------------------- linux-can-fixes-for-5.18-20220331 ---------------------------------------------------------------- Hangyu Hua (3): can: ems_usb: ems_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: mcba_usb: mcba_usb_start_xmit(): fix double dev_kfree_skb in error path Marc Kleine-Budde (2): can: m_can: m_can_tx_handler(): fix use after free of skb can: gs_usb: gs_make_candev(): fix memory leak for devices with extended bit timing configuration Oliver Hartkopp (1): can: isotp: restore accidentally removed MSG_PEEK feature Pavel Skripkin (1): can: mcba_usb: properly check endpoint type Tom Rix (1): can: mcp251xfd: mcp251xfd_register_get_dev_id(): fix return of error value drivers/net/can/m_can/m_can.c | 5 +++-- drivers/net/can/spi/mcp251xfd/mcp251xfd-core.c | 2 +- drivers/net/can/usb/ems_usb.c | 1 - drivers/net/can/usb/gs_usb.c | 2 ++ drivers/net/can/usb/mcba_usb.c | 27 +++++++++++++---------- drivers/net/can/usb/usb_8dev.c | 30 ++++++++++++-------------- net/can/isotp.c | 2 +- 7 files changed, 37 insertions(+), 32 deletions(-)