From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 6E24229ACF7; Tue, 30 Sep 2025 15:19:53 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1759245593; cv=none; b=cWllBCl8l//pQaRv8jXW4w/cRpn8kFhQ+yilVxsPTdd2L1E6eRkKgW3gGxcxBj+8uOLiVUiTV7lVvL72sbjPGUd2uG5oNN/+yYL7PHoPaNjgH0Tjevqe5XPUSPx7vcFccO9ViWAA34nixUvgnVoaX/6fvnBOmTEnnL9dwucnGvQ= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1759245593; c=relaxed/simple; bh=MPJsvw6hQDqKPmyKJvwB8Tkn9r8TDJDXAJHZk9sknuQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=akX6vFrD1FO7ve6xAfXztKSm1uxt0RCVkcHA3QzXeh8fJZypdFOBVUoc6ak9xcWPJ5IpRRQAzrnWy+9+h+qUHqQ16ijIUF3/xKoAO4XxpPvJcHGGfaCVqLvA/ui8kDBsOPMsAYKSuYCsD1jbuPz6zyJeA1QvEmmt01ELX0YKh70= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=Zl157OBY; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="Zl157OBY" Received: by smtp.kernel.org (Postfix) with ESMTPSA id EE2ABC4CEF0; Tue, 30 Sep 2025 15:19:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1759245593; bh=MPJsvw6hQDqKPmyKJvwB8Tkn9r8TDJDXAJHZk9sknuQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Zl157OBYArpQrIUnb12mN9jb6vXzDWKG0b9wN/ONiPhY4bTeSHB+DSiiYWO8ZDBhB oc8V/to7XmGYt1A3GYWFOv3vW9ersw1Xz594CFTZ5bRBShCF7jyybeVIb/b17sV3Bs +sTMBOLT1hugGtpUOTPH69mxcknTOY9xoDpY5kyU= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, =?UTF-8?q?St=C3=A9phane=20Grosjean?= , Marc Kleine-Budde , Sasha Levin Subject: [PATCH 6.1 33/73] can: peak_usb: fix shift-out-of-bounds issue Date: Tue, 30 Sep 2025 16:47:37 +0200 Message-ID: <20250930143821.966367596@linuxfoundation.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20250930143820.537407601@linuxfoundation.org> References: <20250930143820.537407601@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 6.1-stable review patch. If anyone has any objections, please let me know. ------------------ From: Stéphane Grosjean [ Upstream commit c443be70aaee42c2d1d251e0329e0a69dd96ae54 ] 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 Link: https://patch.msgid.link/20250918132413.30071-1-stephane.grosjean@free.fr Reported-by: Marc Kleine-Budde 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 Signed-off-by: Sasha Levin --- 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 1d996d3320fef..928a78947cb0b 100644 --- a/drivers/net/can/usb/peak_usb/pcan_usb_core.c +++ b/drivers/net/can/usb/peak_usb/pcan_usb_core.c @@ -89,7 +89,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