Skip to content

Commit 892d308

Browse files
author
Paolo Abeni
committed
Merge tag 'linux-can-fixes-for-7.2-20260716' of git://git.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can
Marc Kleine-Budde says: ==================== pull-request: can 2026-07-16 this is a pull request of 19 patches for net/main. The first patch is by Alexander Hölzl and fixes the Kconfig description of the vxcan driver. Next patch by Fan Wu fixes the tear down order in the esd_usb driver. Followed by a patch by Oliver Hartkopp that adds missing locking for the raw flags in the CAN_RAW protocol. Shuhao Fu's patch for the j1939 protocol fix lockless local-destination check. Stéphane Grosjean updates their email address. The next 11 patches all target the CAM Broadcast Manager protocol. One contributed by Lee Jones the remaining ones by Oliver Hartkopp. They fix several concurrency and locking issues found by various bots. The last 3 patches are also by Oliver Hartkopp fixing concurrency and locking issues found by various bots in the CAN ISO Transport Protocol. linux-can-fixes-for-7.2-20260716 * tag 'linux-can-fixes-for-7.2-20260716' of git://git.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can: can: isotp: serialize TX state transitions under so->rx_lock can: isotp: fix use-after-free race with concurrent NETDEV_UNREGISTER can: isotp: use unconditional synchronize_rcu() in isotp_release() can: bcm: track a single source interface for ANYDEV timeout/throttle ops can: bcm: fix data race on rx_stamp/rx_ifindex in bcm_rx_handler() can: bcm: fix stale rx/tx ops after device removal can: bcm: add missing device refcount for CAN filter removal can: bcm: validate frame length in bcm_rx_setup() for RTR replies can: bcm: extend bcm_tx_lock usage for data and timer updates can: bcm: add missing rcu list annotations and operations can: bcm: fix CAN frame rx/tx statistics can: bcm: add locking when updating filter and timer values can: bcm: fix lockless bound/ifindex race and silent RX_SETUP failure can: bcm: defer rx_op deallocation to workqueue to fix thrtimer UAF can: peak: Modification of references to email accounts being deleted can: j1939: fix lockless local-destination check can: raw: add locking for raw flags bitfield can: esd_usb: kill anchored URBs before freeing netdevs can: vxcan: Kconfig: fix description stating no local echo provided ==================== Link: https://patch.msgid.link/20260716155528.809908-1-mkl@pengutronix.de Signed-off-by: Paolo Abeni <pabeni@redhat.com>
2 parents 78d24e7 + 6fd9e37 commit 892d308

19 files changed

Lines changed: 788 additions & 288 deletions

File tree

.mailmap

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -825,8 +825,8 @@ Sriram Yagnaraman <sriram.yagnaraman@ericsson.com> <sriram.yagnaraman@est.tech>
825825
Stanislav Fomichev <sdf@fomichev.me> <sdf@google.com>
826826
Stanislav Fomichev <sdf@fomichev.me> <stfomichev@gmail.com>
827827
Stefan Wahren <wahrenst@gmx.net> <stefan.wahren@i2se.com>
828-
Stéphane Grosjean <stephane.grosjean@hms-networks.com> <s.grosjean@peak-system.com>
829-
Stéphane Grosjean <stephane.grosjean@hms-networks.com> <stephane.grosjean@free.fr>
828+
Stéphane Grosjean <s.grosjean@peak-system.fr> <s.grosjean@peak-system.com>
829+
Stéphane Grosjean <s.grosjean@peak-system.fr> <stephane.grosjean@free.fr>
830830
Stéphane Witzmann <stephane.witzmann@ubpmes.univ-bpclermont.fr>
831831
Stephen Hemminger <stephen@networkplumber.org> <shemminger@linux-foundation.org>
832832
Stephen Hemminger <stephen@networkplumber.org> <shemminger@osdl.org>

drivers/net/can/Kconfig

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -40,11 +40,8 @@ config CAN_VXCAN
4040
When one end receives the packet it appears on its pair and vice
4141
versa. The vxcan can be used for cross namespace communication.
4242

43-
In opposite to vcan loopback devices the vxcan only forwards CAN
44-
frames to its pair and does *not* provide a local echo of sent
45-
CAN frames. To disable a potential echo in af_can.c the vxcan driver
46-
announces IFF_ECHO in the interface flags. To have a clean start
47-
in each namespace the CAN GW hop counter is set to zero.
43+
To have a clean start in each namespace the CAN GW hop counter is
44+
set to zero.
4845

4946
This driver can also be built as a module. If so, the module
5047
will be called vxcan.

drivers/net/can/peak_canfd/peak_canfd.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
/* Copyright (C) 2007, 2011 Wolfgang Grandegger <wg@grandegger.com>
33
*
44
* Copyright (C) 2016-2025 PEAK System-Technik GmbH
5-
* Author: Stéphane Grosjean <stephane.grosjean@hms-networks.com>
5+
* Author: Stéphane Grosjean <s.grosjean@peak-system.fr>
66
*/
77

88
#include <linux/can.h>

drivers/net/can/peak_canfd/peak_canfd_user.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
/* CAN driver for PEAK System micro-CAN based adapters
33
*
44
* Copyright (C) 2003-2025 PEAK System-Technik GmbH
5-
* Author: Stéphane Grosjean <stephane.grosjean@hms-networks.com>
5+
* Author: Stéphane Grosjean <s.grosjean@peak-system.fr>
66
*/
77
#ifndef PEAK_CANFD_USER_H
88
#define PEAK_CANFD_USER_H

drivers/net/can/peak_canfd/peak_pciefd_main.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
* Derived from the PCAN project file driver/src/pcan_pci.c:
55
*
66
* Copyright (C) 2001-2025 PEAK System-Technik GmbH
7-
* Author: Stéphane Grosjean <stephane.grosjean@hms-networks.com>
7+
* Author: Stéphane Grosjean <s.grosjean@peak-system.fr>
88
*/
99

1010
#include <linux/kernel.h>
@@ -19,7 +19,7 @@
1919

2020
#include "peak_canfd_user.h"
2121

22-
MODULE_AUTHOR("Stéphane Grosjean <stephane.grosjean@hms-networks.com>");
22+
MODULE_AUTHOR("Stéphane Grosjean <s.grosjean@peak-system.fr>");
2323
MODULE_DESCRIPTION("Socket-CAN driver for PEAK PCAN PCIe/M.2 FD family cards");
2424
MODULE_LICENSE("GPL v2");
2525

drivers/net/can/sja1000/peak_pci.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
* Derived from the PCAN project file driver/src/pcan_pci.c:
66
*
77
* Copyright (C) 2001-2025 PEAK System-Technik GmbH
8-
* Author: Stéphane Grosjean <stephane.grosjean@hms-networks.com>
8+
* Author: Stéphane Grosjean <s.grosjean@peak-system.fr>
99
*/
1010

1111
#include <linux/kernel.h>
@@ -22,7 +22,7 @@
2222

2323
#include "sja1000.h"
2424

25-
MODULE_AUTHOR("Stéphane Grosjean <stephane.grosjean@hms-networks.com>");
25+
MODULE_AUTHOR("Stéphane Grosjean <s.grosjean@peak-system.fr>");
2626
MODULE_DESCRIPTION("Socket-CAN driver for PEAK PCAN PCI family cards");
2727
MODULE_LICENSE("GPL v2");
2828

drivers/net/can/sja1000/peak_pcmcia.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
* Derived from the PCAN project file driver/src/pcan_pccard.c
55
*
66
* Copyright (C) 2006-2025 PEAK System-Technik GmbH
7-
* Author: Stéphane Grosjean <stephane.grosjean@hms-networks.com>
7+
* Author: Stéphane Grosjean <s.grosjean@peak-system.fr>
88
*/
99
#include <linux/kernel.h>
1010
#include <linux/module.h>
@@ -19,7 +19,7 @@
1919
#include <linux/can/dev.h>
2020
#include "sja1000.h"
2121

22-
MODULE_AUTHOR("Stéphane Grosjean <stephane.grosjean@hms-networks.com>");
22+
MODULE_AUTHOR("Stéphane Grosjean <s.grosjean@peak-system.fr>");
2323
MODULE_DESCRIPTION("CAN driver for PEAK-System PCAN-PC Cards");
2424
MODULE_LICENSE("GPL v2");
2525

drivers/net/can/usb/esd_usb.c

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1390,10 +1390,13 @@ static void esd_usb_disconnect(struct usb_interface *intf)
13901390
netdev = dev->nets[i]->netdev;
13911391
netdev_info(netdev, "unregister\n");
13921392
unregister_netdev(netdev);
1393-
free_candev(netdev);
13941393
}
13951394
}
13961395
unlink_all_urbs(dev);
1396+
for (i = 0; i < dev->net_count; i++) {
1397+
if (dev->nets[i])
1398+
free_candev(dev->nets[i]->netdev);
1399+
}
13971400
kfree(dev);
13981401
}
13991402
}

drivers/net/can/usb/peak_usb/pcan_usb.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
* Derived from the PCAN project file driver/src/pcan_usb.c
55
*
66
* Copyright (C) 2003-2025 PEAK System-Technik GmbH
7-
* Author: Stéphane Grosjean <stephane.grosjean@hms-networks.com>
7+
* Author: Stéphane Grosjean <s.grosjean@peak-system.fr>
88
*
99
* Many thanks to Klaus Hitschler <klaus.hitschler@gmx.de>
1010
*/

drivers/net/can/usb/peak_usb/pcan_usb_core.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
* Derived from the PCAN project file driver/src/pcan_usb_core.c
55
*
66
* Copyright (C) 2003-2025 PEAK System-Technik GmbH
7-
* Author: Stéphane Grosjean <stephane.grosjean@hms-networks.com>
7+
* Author: Stéphane Grosjean <s.grosjean@peak-system.fr>
88
*
99
* Many thanks to Klaus Hitschler <klaus.hitschler@gmx.de>
1010
*/
@@ -24,7 +24,7 @@
2424

2525
#include "pcan_usb_core.h"
2626

27-
MODULE_AUTHOR("Stéphane Grosjean <stephane.grosjean@hms-networks.com>");
27+
MODULE_AUTHOR("Stéphane Grosjean <s.grosjean@peak-system.fr>");
2828
MODULE_DESCRIPTION("CAN driver for PEAK-System USB adapters");
2929
MODULE_LICENSE("GPL v2");
3030

0 commit comments

Comments
 (0)