github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-05-31 18:43:33 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

linux-can-fixes-for-6.19-20251218

Browse Source 
-----BEGIN PGP SIGNATURE-----
 
 iQFHBAABCgAxFiEEn/sM2K9nqF/8FWzzDHRl3/mQkZwFAmlDyJcTHG1rbEBwZW5n
 dXRyb25peC5kZQAKCRAMdGXf+ZCRnOZdB/9o/qoE3SiQkgNbVce4iDQqm/4jZFEf
 Wz4KjpucPxw00z25VbINeM6G4Tjfztmw6T6m1GarwEzW0HTNGUirjXJr60Bxz3OF
 DgjPfc/w5PU5f/I84RBdSnnFEGKt1mAd3WrJjBEGbLZYxx3EHh+PxJXDM2qAmxVT
 9Ud2U6X9oEdor78IFrO8Z/rt2YMPBZJ0JmldQYkvxmBmUiDMgcY/E9vNHejUwHTc
 ysE7c6MJ7tGalm6jXlV5kpWycsNbY52TbOD242jTJnWVHr2GKOu8k8GymkXSZnQP
 NG/h20elyIsD5N0OaxQODorM8UiEueovO24TqVqwl7hxTw8IFK+AUXC5
 =cXcU
 -----END PGP SIGNATURE-----

Merge tag 'linux-can-fixes-for-6.19-20251218' of git://git.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can

Marc Kleine-Budde says:

====================
pull-request: can 2025-12-18

this is a pull request of 3 patches for net/main.

Tetsuo Handa contributes 2 patches to fix race windows in the j1939
protocol to properly handle disappearing network devices.

The last patch is by me, it fixes a build dependency with the CAN
drivers, that got introduced while fixing a dependency between the CAN
protocol and CAN device code.

linux-can-fixes-for-6.19-20251218

* tag 'linux-can-fixes-for-6.19-20251218' of git://git.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can:
  can: fix build dependency
  can: j1939: make j1939_sk_bind() fail if device is no longer registered
  can: j1939: make j1939_session_activate() fail if device is no longer registered
====================

Link: https://patch.msgid.link/20251218123132.664533-1-mkl@pengutronix.de
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
This commit is contained in:
Paolo Abeni 2025-12-18 17:23:07 +01:00
commit 21a88f5d9c
3 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/net/can/Kconfig
View File

@ -17,7 +17,7 @@ menuconfig CAN_DEV
virtual ones. If you own such devices or plan to use the virtual CAN
interfaces to develop applications, say Y here.
if CAN_DEV
if CAN_DEV && CAN
config CAN_VCAN
tristate "Virtual Local CAN Interface (vcan)"

6
net/can/j1939/socket.c
View File

@ -482,6 +482,12 @@ static int j1939_sk_bind(struct socket *sock, struct sockaddr_unsized *uaddr, in
goto out_release_sock;
}
if (ndev->reg_state != NETREG_REGISTERED) {
dev_put(ndev);
ret = -ENODEV;
goto out_release_sock;
}
can_ml = can_get_ml_priv(ndev);
if (!can_ml) {
dev_put(ndev);

2
net/can/j1939/transport.c
View File

@ -1567,6 +1567,8 @@ int j1939_session_activate(struct j1939_session *session)
if (active) {
j1939_session_put(active);
ret = -EAGAIN;
} else if (priv->ndev->reg_state != NETREG_REGISTERED) {
ret = -ENODEV;
} else {
WARN_ON_ONCE(session->state != J1939_SESSION_NEW);
list_add_tail(&session->active_session_list_entry,