Message ID | 20240912075804.2825408-2-mkl@pengutronix.de (mailing list archive) |
---|---|
State | Accepted |
Commit | 94b0818fa63555a65f6ba107080659ea6bcca63e |
Delegated to: | Netdev Maintainers |
Headers | show |
Series | [net,1/5] can: bcm: Clear bo->bcm_proc_read after remove_proc_entry(). | expand |
Context | Check | Description |
---|---|---|
netdev/tree_selection | success | Clearly marked for net |
netdev/apply | fail | Patch does not apply to net-0 |
Hello: This series was applied to netdev/net.git (main) by Marc Kleine-Budde <mkl@pengutronix.de>: On Thu, 12 Sep 2024 09:50:50 +0200 you wrote: > From: Kuniyuki Iwashima <kuniyu@amazon.com> > > syzbot reported a warning in bcm_release(). [0] > > The blamed change fixed another warning that is triggered when > connect() is issued again for a socket whose connect()ed device has > been unregistered. > > [...] Here is the summary with links: - [net,1/5] can: bcm: Clear bo->bcm_proc_read after remove_proc_entry(). https://git.kernel.org/netdev/net/c/94b0818fa635 - [net,2/5] can: esd_usb: Remove CAN_CTRLMODE_3_SAMPLES for CAN-USB/3-FD https://git.kernel.org/netdev/net/c/75b318954057 - [net,3/5] can: kvaser_pciefd: Enable 64-bit DMA addressing https://git.kernel.org/netdev/net/c/d0fa06408ccf - [net,5/5] can: m_can: m_can_close(): stop clocks after device has been shut down https://git.kernel.org/netdev/net/c/2c09b50efcad - [net-next,4/5] can: rockchip_canfd: rkcanfd_timestamp_init(): rework delay calculation (no matching commit) You are awesome, thank you!
Hello: This series was applied to netdev/net-next.git (main) by Marc Kleine-Budde <mkl@pengutronix.de>: On Thu, 12 Sep 2024 09:50:50 +0200 you wrote: > From: Kuniyuki Iwashima <kuniyu@amazon.com> > > syzbot reported a warning in bcm_release(). [0] > > The blamed change fixed another warning that is triggered when > connect() is issued again for a socket whose connect()ed device has > been unregistered. > > [...] Here is the summary with links: - [net,1/5] can: bcm: Clear bo->bcm_proc_read after remove_proc_entry(). (no matching commit) - [net,2/5] can: esd_usb: Remove CAN_CTRLMODE_3_SAMPLES for CAN-USB/3-FD (no matching commit) - [net,3/5] can: kvaser_pciefd: Enable 64-bit DMA addressing (no matching commit) - [net,5/5] can: m_can: m_can_close(): stop clocks after device has been shut down (no matching commit) - [net-next,4/5] can: rockchip_canfd: rkcanfd_timestamp_init(): rework delay calculation https://git.kernel.org/netdev/net-next/c/cd0983c7f880 You are awesome, thank you!
diff --git a/net/can/bcm.c b/net/can/bcm.c index 46d3ec3aa44b..217049fa496e 100644 --- a/net/can/bcm.c +++ b/net/can/bcm.c @@ -1471,8 +1471,10 @@ static void bcm_notify(struct bcm_sock *bo, unsigned long msg, /* remove device reference, if this is our bound device */ if (bo->bound && bo->ifindex == dev->ifindex) { #if IS_ENABLED(CONFIG_PROC_FS) - if (sock_net(sk)->can.bcmproc_dir && bo->bcm_proc_read) + if (sock_net(sk)->can.bcmproc_dir && bo->bcm_proc_read) { remove_proc_entry(bo->procname, sock_net(sk)->can.bcmproc_dir); + bo->bcm_proc_read = NULL; + } #endif bo->bound = 0; bo->ifindex = 0;