| Message ID | 20210120125202.2187358-1-mkl@pengutronix.de (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 535d31593f5951f2cd344df7cb618ca48f67393f |
| Headers | show |
| Series | pull-request: can 2021-01-20 | expand |
| Context | Check | Description |
|---|---|---|
| netdev/tree_selection | success | Series ignored based on subject |
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
On Wed, 20 Jan 2021 21:20:13 +0100 Marc Kleine-Budde wrote: > 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. It's been reported but it's unclear what's causing this one :( > >> 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. The merge has been done now, could you double check?
Hello: This pull request was applied to netdev/net-next.git (refs/heads/master): On Wed, 20 Jan 2021 13:51:59 +0100 you wrote: > 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(). > > [...] Here is the summary with links: - pull-request: can 2021-01-20 https://git.kernel.org/netdev/net-next/c/535d31593f59 You are awesome, thank you! -- Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html
On 1/20/21 9:36 PM, Jakub Kicinski wrote: >>>> 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. > > The merge has been done now, could you double check? Looks good! Thanks, Marc
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(-)