From: Greg Kroah-Hartman Date: Sun, 9 Nov 2025 04:16:46 +0000 (+0900) Subject: 5.10-stable patches X-Git-Tag: v6.12.58~17 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=539be8139444051488688300614b70b15841caf9;p=thirdparty%2Fkernel%2Fstable-queue.git 5.10-stable patches added patches: lib-crypto-curve25519-hacl64-fix-older-clang-kasan-workaround-for-gcc.patch --- diff --git a/queue-5.10/lib-crypto-curve25519-hacl64-fix-older-clang-kasan-workaround-for-gcc.patch b/queue-5.10/lib-crypto-curve25519-hacl64-fix-older-clang-kasan-workaround-for-gcc.patch new file mode 100644 index 0000000000..975ec70655 --- /dev/null +++ b/queue-5.10/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 +Date: Mon, 3 Nov 2025 12:11:24 -0700 +Subject: lib/crypto: curve25519-hacl64: Fix older clang KASAN workaround for GCC + +From: Nathan Chancellor + +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 +Acked-by: Ard Biesheuvel +Link: https://lore.kernel.org/r/20251103-curve25519-hacl64-fix-kasan-workaround-v2-1-ab581cbd8035@kernel.org +Signed-off-by: Eric Biggers +Signed-off-by: Greg Kroah-Hartman +--- + 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.10/series b/queue-5.10/series index 7b98631423..260ceee6c1 100644 --- a/queue-5.10/series +++ b/queue-5.10/series @@ -168,3 +168,4 @@ sctp-hold-endpoint-before-calling-cb-in-sctp_transpo.patch sctp-hold-sock-lock-while-iterating-over-address-lis.patch net-usb-qmi_wwan-initialize-mac-header-offset-in-qmi.patch tracing-fix-memory-leaks-in-create_field_var.patch +lib-crypto-curve25519-hacl64-fix-older-clang-kasan-workaround-for-gcc.patch