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,
"Stéphane Grosjean" <stephane.grosjean@hms-networks.com>,
"Marc Kleine-Budde" <mkl@pengutronix.de>
Subject: [PATCH net 7/7] can: peak_usb: fix shift-out-of-bounds issue
Date: Tue, 23 Sep 2025 09:32:53 +0200 [thread overview]
Message-ID: <20250923073427.493034-8-mkl@pengutronix.de> (raw)
In-Reply-To: <20250923073427.493034-1-mkl@pengutronix.de>
From: Stéphane Grosjean <stephane.grosjean@hms-networks.com>
Explicitly uses a 64-bit constant when the number of bits used for its
shifting is 32 (which is the case for PC CAN FD interfaces supported by
this driver).
Signed-off-by: Stéphane Grosjean <stephane.grosjean@hms-networks.com>
Link: https://patch.msgid.link/20250918132413.30071-1-stephane.grosjean@free.fr
Reported-by: Marc Kleine-Budde <mkl@pengutronix.de>
Closes: https://lore.kernel.org/20250917-aboriginal-refined-honeybee-82b1aa-mkl@pengutronix.de
Fixes: bb4785551f64 ("can: usb: PEAK-System Technik USB adapters driver core")
[mkl: update subject, apply manually]
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
---
drivers/net/can/usb/peak_usb/pcan_usb_core.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/net/can/usb/peak_usb/pcan_usb_core.c b/drivers/net/can/usb/peak_usb/pcan_usb_core.c
index 117637b9b995..dd5caa1c302b 100644
--- a/drivers/net/can/usb/peak_usb/pcan_usb_core.c
+++ b/drivers/net/can/usb/peak_usb/pcan_usb_core.c
@@ -111,7 +111,7 @@ void peak_usb_update_ts_now(struct peak_time_ref *time_ref, u32 ts_now)
u32 delta_ts = time_ref->ts_dev_2 - time_ref->ts_dev_1;
if (time_ref->ts_dev_2 < time_ref->ts_dev_1)
- delta_ts &= (1 << time_ref->adapter->ts_used_bits) - 1;
+ delta_ts &= (1ULL << time_ref->adapter->ts_used_bits) - 1;
time_ref->ts_total += delta_ts;
}
--
2.51.0
prev parent reply other threads:[~2025-09-23 7:42 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-09-23 7:32 [PATCH net 0/7] pull-request: can 2025-09-23 Marc Kleine-Budde
2025-09-23 7:32 ` [PATCH net 1/7] can: hi311x: fix null pointer dereference when resuming from sleep before interface was enabled Marc Kleine-Budde
2025-09-24 0:00 ` patchwork-bot+netdevbpf
2025-09-24 8:53 ` [PATCH net 1/7] can: hi311x: fix null pointer dereference when resuming from sleep before interface was enabled: manual merge Matthieu Baerts
2025-09-24 9:03 ` Marc Kleine-Budde
2025-09-23 7:32 ` [PATCH net 2/7] can: rcar_canfd: Fix controller mode setting Marc Kleine-Budde
2025-09-23 7:32 ` [PATCH net 3/7] can: etas_es58x: populate ndo_change_mtu() to prevent buffer overflow Marc Kleine-Budde
2025-09-23 7:32 ` [PATCH net 4/7] can: hi311x: " Marc Kleine-Budde
2025-09-23 7:32 ` [PATCH net 5/7] can: sun4i_can: " Marc Kleine-Budde
2025-09-23 7:32 ` [PATCH net 6/7] can: mcba_usb: " Marc Kleine-Budde
2025-09-23 7:32 ` Marc Kleine-Budde [this message]
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=20250923073427.493034-8-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 \
--cc=stephane.grosjean@hms-networks.com \
/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