5.15-stable patches

added patches:
	lib-crypto-curve25519-hacl64-fix-older-clang-kasan-workaround-for-gcc.patch
	rtc-rx8025-fix-incorrect-register-reference.patch

diff --git a/queue-5.15/lib-crypto-curve25519-hacl64-fix-older-clang-kasan-workaround-for-gcc.patch b/queue-5.15/lib-crypto-curve25519-hacl64-fix-older-clang-kasan-workaround-for-gcc.patch
new file mode 100644 (file)
index 0000000..975ec70
--- /dev/null
+++ b/queue-5.15/lib-crypto-curve25519-hacl64-fix-older-clang-kasan-workaround-for-gcc.patch
@@ -0,0 +1,37 @@
+From 2b81082ad37cc3f28355fb73a6a69b91ff7dbf20 Mon Sep 17 00:00:00 2001
+From: Nathan Chancellor <nathan@kernel.org>
+Date: Mon, 3 Nov 2025 12:11:24 -0700
+Subject: lib/crypto: curve25519-hacl64: Fix older clang KASAN workaround for GCC
+
+From: Nathan Chancellor <nathan@kernel.org>
+
+commit 2b81082ad37cc3f28355fb73a6a69b91ff7dbf20 upstream.
+
+Commit 2f13daee2a72 ("lib/crypto/curve25519-hacl64: Disable KASAN with
+clang-17 and older") inadvertently disabled KASAN in curve25519-hacl64.o
+for GCC unconditionally because clang-min-version will always evaluate
+to nothing for GCC. Add a check for CONFIG_CC_IS_CLANG to avoid applying
+the workaround for GCC, which is only needed for clang-17 and older.
+
+Cc: stable@vger.kernel.org
+Fixes: 2f13daee2a72 ("lib/crypto/curve25519-hacl64: Disable KASAN with clang-17 and older")
+Signed-off-by: Nathan Chancellor <nathan@kernel.org>
+Acked-by: Ard Biesheuvel <ardb@kernel.org>
+Link: https://lore.kernel.org/r/20251103-curve25519-hacl64-fix-kasan-workaround-v2-1-ab581cbd8035@kernel.org
+Signed-off-by: Eric Biggers <ebiggers@kernel.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ lib/crypto/Makefile |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/lib/crypto/Makefile
++++ b/lib/crypto/Makefile
+@@ -23,7 +23,7 @@ libcurve25519-generic-y                              := curve25519
+ libcurve25519-generic-$(CONFIG_ARCH_SUPPORTS_INT128)  := curve25519-hacl64.o
+ libcurve25519-generic-y                               += curve25519-generic.o
+ # clang versions prior to 18 may blow out the stack with KASAN
+-ifeq ($(call clang-min-version, 180000),)
++ifeq ($(CONFIG_CC_IS_CLANG)_$(call clang-min-version, 180000),y_)
+ KASAN_SANITIZE_curve25519-hacl64.o := n
+ endif
+ 

diff --git a/queue-5.15/rtc-rx8025-fix-incorrect-register-reference.patch b/queue-5.15/rtc-rx8025-fix-incorrect-register-reference.patch
new file mode 100644 (file)
index 0000000..b4056cd
--- /dev/null
+++ b/queue-5.15/rtc-rx8025-fix-incorrect-register-reference.patch
@@ -0,0 +1,33 @@
+From 162f24cbb0f6ec596e7e9f3e91610d79dc805229 Mon Sep 17 00:00:00 2001
+From: Yuta Hayama <hayama@lineo.co.jp>
+Date: Wed, 15 Oct 2025 12:07:05 +0900
+Subject: rtc: rx8025: fix incorrect register reference
+
+From: Yuta Hayama <hayama@lineo.co.jp>
+
+commit 162f24cbb0f6ec596e7e9f3e91610d79dc805229 upstream.
+
+This code is intended to operate on the CTRL1 register, but ctrl[1] is
+actually CTRL2. Correctly, ctrl[0] is CTRL1.
+
+Signed-off-by: Yuta Hayama <hayama@lineo.co.jp>
+Fixes: 71af91565052 ("rtc: rx8025: fix 12/24 hour mode detection on RX-8035")
+Cc: stable@vger.kernel.org
+Link: https://patch.msgid.link/eae5f479-5d28-4a37-859d-d54794e7628c@lineo.co.jp
+Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/rtc/rtc-rx8025.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/drivers/rtc/rtc-rx8025.c
++++ b/drivers/rtc/rtc-rx8025.c
+@@ -318,7 +318,7 @@ static int rx8025_init_client(struct i2c
+                       return hour_reg;
+               rx8025->is_24 = (hour_reg & RX8035_BIT_HOUR_1224);
+       } else {
+-              rx8025->is_24 = (ctrl[1] & RX8025_BIT_CTRL1_1224);
++              rx8025->is_24 = (ctrl[0] & RX8025_BIT_CTRL1_1224);
+       }
+ out:
+       return err;

diff --git a/queue-5.15/series b/queue-5.15/series
index ff77ac9b46b7740b00e4546eb860900bfa5fbf5c..ffd3c2a3379be784f196b98316dccf6041fa44f5 100644 (file)
--- a/queue-5.15/series
+++ b/queue-5.15/series
@@ -225,3 +225,5 @@ net-usb-qmi_wwan-initialize-mac-header-offset-in-qmi.patch
 bnxt_en-ptp-refactor-ptp-initialization-functions.patch
 bnxt_en-fix-a-possible-memory-leak-in-bnxt_ptp_init.patch
 tracing-fix-memory-leaks-in-create_field_var.patch
+rtc-rx8025-fix-incorrect-register-reference.patch
+lib-crypto-curve25519-hacl64-fix-older-clang-kasan-workaround-for-gcc.patch