]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commit
Merge tag 'linux-can-fixes-for-6.8-20240214' of git://git.kernel.org/pub/scm/linux...
authorPaolo Abeni <pabeni@redhat.com>
Thu, 15 Feb 2024 11:31:22 +0000 (12:31 +0100)
committerPaolo Abeni <pabeni@redhat.com>
Thu, 15 Feb 2024 11:31:23 +0000 (12:31 +0100)
commitf3ac28e1f8ae8e3dc18323d4fdf3b0a4f6c77f54
tree569e1fd772ac163ed21b58b04928e60a20ebdfd9
parent488b6d91b07112eaaaa4454332c1480894d4e06e
parent2aa0a5e65eae27dbd96faca92c84ecbf6f492d42
Merge tag 'linux-can-fixes-for-6.8-20240214' of git://git.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can

Marc Kleine-Budde says:

====================
pull-request: can 2024-02-14

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

the first patch is by Ziqi Zhao and targets the CAN J1939 protocol, it
fixes a potential deadlock by replacing the spinlock by an rwlock.

Oleksij Rempel's patch adds a missing spin_lock_bh() to prevent a
potential Use-After-Free in the CAN J1939's
setsockopt(SO_J1939_FILTER).

Maxime Jayat contributes a patch to fix the transceiver delay
compensation (TDCO) calculation, which is needed for higher CAN-FD bit
rates (usually 2Mbit/s).

* tag 'linux-can-fixes-for-6.8-20240214' of git://git.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can:
  can: netlink: Fix TDCO calculation using the old data bittiming
  can: j1939: Fix UAF in j1939_sk_match_filter during setsockopt(SO_J1939_FILTER)
  can: j1939: prevent deadlock by changing j1939_socks_lock to rwlock
====================

Link: https://lore.kernel.org/r/20240214140348.2412776-1-mkl@pengutronix.de
Signed-off-by: Paolo Abeni <pabeni@redhat.com>