Merge tag 'libcrypto-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiggers/linux

7083bb60 · Linus Torvalds <[email protected]> · 2025-10-24 15:51:24 -07:00

Pull crypto library fix from Eric Biggers:
 "Avoid some false-positive KMSAN warnings by restoring the dependency
  of the architecture-optimized Poly1305 code on !KMSAN"

* tag 'libcrypto-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiggers/linux:
  lib/crypto: poly1305: Restore dependency of arch code on !KMSAN

Commit: 7083bb6060a99a4c7e60e710b70a2ea8fb2d524c
Parents: f2b24657 · 1af424b1

Merge commit. Changes below are compared with the first parent: f2b24657.

Changes

1 files changed · +1 −1

File	Status	Add	Del	Content
lib/crypto/Kconfig	modified	+1	−1	View file

lib/crypto/Kconfig

View file

diff --git a/lib/crypto/Kconfig b/lib/crypto/Kconfig
index eea17e3..8886055 100644
--- a/lib/crypto/Kconfig
+++ b/lib/crypto/Kconfig
@@ -97,7 +97,7 @@ config CRYPTO_LIB_POLY1305
 
 config CRYPTO_LIB_POLY1305_ARCH
 	bool
-	depends on CRYPTO_LIB_POLY1305 && !UML
+	depends on CRYPTO_LIB_POLY1305 && !UML && !KMSAN
 	default y if ARM
 	default y if ARM64 && KERNEL_MODE_NEON
 	default y if MIPS