Skip to contentSkip to conversation

FAILED: patch "[PATCH] crypto: memneq - move into lib/" failed to apply to 5.19-stable tree

PATCH [email protected] 1 participant 1 message Aug 15, 2022

Subsystems (4)
Stable branch Library code Crypto API Crypto library
lore
Share & tools
lore

[email protected]

author maintainer
#0 lore raw

The patch below does not apply to the 5.19-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.

thanks,

greg k-h

------------------ original commit in Linus's tree ------------------

From 920b0442b9f884f55f4745b53430c80e71e90275 Mon Sep 17 00:00:00 2001
From: "Jason A. Donenfeld" <[email protected]>
Date: Sat, 28 May 2022 12:24:29 +0200
Subject: [PATCH] crypto: memneq - move into lib/

This is used by code that doesn't need CONFIG_CRYPTO, so move this into lib/ with a Kconfig option so that it can be selected by whatever needs it.

This fixes a linker error Zheng pointed out when
CRYPTO_MANAGER_DISABLE_TESTS!=y and CRYPTO=m:

lib/crypto/curve25519-selftest.o: In function `curve25519_selftest':
curve25519-selftest.c:(.init.text+0x60): undefined reference to __crypto_memneq' curve25519-selftest.c:(.init.text+0xec): undefined reference to __crypto_memneq' curve25519-selftest.c:(.init.text+0x114): undefined reference to __crypto_memneq' curve25519-selftest.c:(.init.text+0x154): undefined reference to __crypto_memneq'

Reported-by Zheng Bin <[email protected]>
Cc Eric Biggers <[email protected]>
Cc [email protected]
Fixes aa127963f1ca ("crypto: lib/curve25519 - re-add selftests")
Signed-off-by Jason A. Donenfeld <[email protected]>
Reviewed-by Eric Biggers <[email protected]>
Signed-off-by Herbert Xu <[email protected]>
crypto/Kconfig +1 -0
index 9b654984de79..6e30e8138057 100644
@@ -15,6 +15,7 @@ source "crypto/async_tx/Kconfig"
 #
 menuconfig CRYPTO
 	tristate "Cryptographic API"
+	select LIB_MEMNEQ
 	help
 	  This option provides the core Cryptographic API.
crypto/Makefile +1 -1
index 3bbc0dd49160..1f529704fe80 100644
@@ -4,7 +4,7 @@
 #
 
 obj-$(CONFIG_CRYPTO) += crypto.o
-crypto-y := api.o cipher.o compress.o memneq.o
+crypto-y := api.o cipher.o compress.o
 
 obj-$(CONFIG_CRYPTO_ENGINE) += crypto_engine.o
 obj-$(CONFIG_CRYPTO_FIPS) += fips.o
lib/Kconfig +3 -0
index 6a843639814f..eaaad4d85bf2 100644
@@ -120,6 +120,9 @@ config INDIRECT_IOMEM_FALLBACK
 
 source "lib/crypto/Kconfig"
 
+config LIB_MEMNEQ
+	bool
+
 config CRC_CCITT
 	tristate "CRC-CCITT functions"
 	help
lib/Makefile +1 -0
index ea54294d73bf..f99bf61f8bbc 100644
@@ -251,6 +251,7 @@ obj-$(CONFIG_DIMLIB) += dim/
 obj-$(CONFIG_SIGNATURE) += digsig.o
 
 lib-$(CONFIG_CLZ_TAB) += clz_tab.o
+lib-$(CONFIG_LIB_MEMNEQ) += memneq.o
 
 obj-$(CONFIG_GENERIC_STRNCPY_FROM_USER) += strncpy_from_user.o
 obj-$(CONFIG_GENERIC_STRNLEN_USER) += strnlen_user.o
lib/crypto/Kconfig +1 -0
index 9856e291f414..2082af43d51f 100644
@@ -71,6 +71,7 @@ config CRYPTO_LIB_CURVE25519
 	tristate "Curve25519 scalar multiplication library"
 	depends on CRYPTO_ARCH_HAVE_LIB_CURVE25519 || !CRYPTO_ARCH_HAVE_LIB_CURVE25519
 	select CRYPTO_LIB_CURVE25519_GENERIC if CRYPTO_ARCH_HAVE_LIB_CURVE25519=n
+	select LIB_MEMNEQ
 	help
 	  Enable the Curve25519 library interface. This interface may be
 	  fulfilled by either the generic implementation or an arch-specific
lib/memneq.c renamed from crypto/memneq.c +0 -0
similarity index 100%
rename from crypto/memneq.c
rename to lib/memneq.c