From: Marc Kleine-Budde <mkl@pengutronix.de>
To: netdev@vger.kernel.org
Cc: davem@davemloft.net, kuba@kernel.org, linux-can@vger.kernel.org,
kernel@pengutronix.de
Subject: [PATCH net 0/3] pull-request: can 2024-02-14
Date: Wed, 14 Feb 2024 14:59:04 +0100 [thread overview]
Message-ID: <20240214140348.2412776-1-mkl@pengutronix.de> (raw)
Hello netdev-team,
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).
regards,
Marc
---
The following changes since commit 858b31133dbec88465bcc0a006f4dc43173662b8:
octeontx2-af: Remove the PF_FUNC validation for NPC transmit rules (2024-02-14 09:31:44 +0000)
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-6.8-20240214
for you to fetch changes up to 2aa0a5e65eae27dbd96faca92c84ecbf6f492d42:
can: netlink: Fix TDCO calculation using the old data bittiming (2024-02-14 13:53:03 +0100)
----------------------------------------------------------------
linux-can-fixes-for-6.8-20240214
----------------------------------------------------------------
Maxime Jayat (1):
can: netlink: Fix TDCO calculation using the old data bittiming
Oleksij Rempel (1):
can: j1939: Fix UAF in j1939_sk_match_filter during setsockopt(SO_J1939_FILTER)
Ziqi Zhao (1):
can: j1939: prevent deadlock by changing j1939_socks_lock to rwlock
drivers/net/can/dev/netlink.c | 2 +-
net/can/j1939/j1939-priv.h | 3 ++-
net/can/j1939/main.c | 2 +-
net/can/j1939/socket.c | 46 ++++++++++++++++++++++++++++---------------
4 files changed, 34 insertions(+), 19 deletions(-)
next reply other threads:[~2024-02-15 10:44 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-02-14 13:59 Marc Kleine-Budde [this message]
2024-02-14 13:59 ` [PATCH net 1/3] can: j1939: prevent deadlock by changing j1939_socks_lock to rwlock Marc Kleine-Budde
2024-02-15 11:43 ` Paolo Abeni
2024-02-15 11:50 ` patchwork-bot+netdevbpf
2024-02-14 13:59 ` [PATCH net 2/3] can: j1939: Fix UAF in j1939_sk_match_filter during setsockopt(SO_J1939_FILTER) Marc Kleine-Budde
2024-02-14 13:59 ` [PATCH net 3/3] can: netlink: Fix TDCO calculation using the old data bittiming Marc Kleine-Budde
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240214140348.2412776-1-mkl@pengutronix.de \
--to=mkl@pengutronix.de \
--cc=davem@davemloft.net \
--cc=kernel@pengutronix.de \
--cc=kuba@kernel.org \
--cc=linux-can@vger.kernel.org \
--cc=netdev@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).