[OpenWrt-Devel] [PATCH] cryptodev-linux: Fix error when compiling with 5.4 kernel

[Sebastian Kemper]

On Tue, Mar 17, 2020 at 10:27:13PM +0800, Jeffery To wrote:
> Currently, cryptodev-linux fails to compile with a
> '"crypto_givcipher_type" undefined' error for targets on the 5.4 kernel,
> e.g. armvirt[1].
>
> This backports an upstream patch[2] that fixes this error.
>
> [1]: https://downloads.openwrt.org/snapshots/faillogs/aarch64_generic/base/cryptodev-linux/compile.txt
> [2]: https://github.com/cryptodev-linux/cryptodev-linux/commit/f971e0cd4a0ebe59fb2e8e17240399bf6901b09b
>
> Signed-off-by: Jeffery To <jeffery.to at gmail.com>

Acked-by: Sebastian Kemper <sebastian_ml at gmx.net>

Hi all,

Please include this. With kernel 5.4 cryptodev currently fails on the
bots. And when cryptodev fails then openssl fails as well and so on and
so forth.

Thanks!
Seb

> ---
>  package/kernel/cryptodev-linux/Makefile       |  2 +-
>  ...x-module-loading-with-Linux-v5.0-rc5.patch | 50 +++++++++++++++++++
>  2 files changed, 51 insertions(+), 1 deletion(-)
>  create mode 100644 package/kernel/cryptodev-linux/patches/010-Fix-module-loading-with-Linux-v5.0-rc5.patch
>
> diff --git a/package/kernel/cryptodev-linux/Makefile b/package/kernel/cryptodev-linux/Makefile
> index da18c714b0..9bea63ebd1 100644
> --- a/package/kernel/cryptodev-linux/Makefile
> +++ b/package/kernel/cryptodev-linux/Makefile
> @@ -11,7 +11,7 @@ include $(INCLUDE_DIR)/kernel.mk
>
>  PKG_NAME:=cryptodev-linux
>  PKG_VERSION:=1.10
> -PKG_RELEASE:=1
> +PKG_RELEASE:=2
>
>  PKG_SOURCE_URL:=https://codeload.github.com/$(PKG_NAME)/$(PKG_NAME)/tar.gz/$(PKG_NAME)-$(PKG_VERSION)?
>  PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
> diff --git a/package/kernel/cryptodev-linux/patches/010-Fix-module-loading-with-Linux-v5.0-rc5.patch b/package/kernel/cryptodev-linux/patches/010-Fix-module-loading-with-Linux-v5.0-rc5.patch
> new file mode 100644
> index 0000000000..5909f6dfb3
> --- /dev/null
> +++ b/package/kernel/cryptodev-linux/patches/010-Fix-module-loading-with-Linux-v5.0-rc5.patch
> @@ -0,0 +1,50 @@
> +From f971e0cd4a0ebe59fb2e8e17240399bf6901b09b Mon Sep 17 00:00:00 2001
> +From: "Derald D. Woods" <woods.technical at gmail.com>
> +Date: Sun, 10 Feb 2019 13:22:19 -0600
> +Subject: [PATCH] Fix module loading with Linux v5.0-rc5
> +
> +This commit fixes this module load error:
> +[...]
> +[   29.112091] cryptodev: loading out-of-tree module taints kernel.
> +[   29.128906] cryptodev: Unknown symbol crypto_givcipher_type (err -2)
> +[   29.188842] cryptodev: Unknown symbol crypto_givcipher_type (err -2)
> +modprobe: can't load module cryptodev (extra/cryptodev.ko): unknown symbol in module, or unknown parameter
> +[...]
> +
> +Upstream Linux support for unused GIVCIPHER, and others, was dropped here:
> +
> +c79b411eaa72 (crypto: skcipher - remove remnants of internal IV generators)
> +
> +Signed-off-by: Derald D. Woods <woods.technical at gmail.com>
> +---
> + cryptlib.c | 9 +++++++--
> + 1 file changed, 7 insertions(+), 2 deletions(-)
> +
> +diff --git a/cryptlib.c b/cryptlib.c
> +index 6e66698..4a87037 100644
> +--- a/cryptlib.c
> ++++ b/cryptlib.c
> +@@ -38,7 +38,9 @@
> + #include "cryptodev_int.h"
> + #include "cipherapi.h"
> +
> ++#if (LINUX_VERSION_CODE < KERNEL_VERSION(5, 0, 0))
> + extern const struct crypto_type crypto_givcipher_type;
> ++#endif
> +
> + static void cryptodev_complete(struct crypto_async_request *req, int err)
> + {
> +@@ -157,8 +159,11 @@ int cryptodev_cipher_init(struct cipher_data *out, const char *alg_name,
> +
> + #if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 8, 0))
> + 		tfm = crypto_skcipher_tfm(out->async.s);
> +-		if ((tfm->__crt_alg->cra_type == &crypto_ablkcipher_type) ||
> +-		    (tfm->__crt_alg->cra_type == &crypto_givcipher_type)) {
> ++		if ((tfm->__crt_alg->cra_type == &crypto_ablkcipher_type)
> ++#if (LINUX_VERSION_CODE < KERNEL_VERSION(5, 0, 0))
> ++		    || (tfm->__crt_alg->cra_type == &crypto_givcipher_type)
> ++#endif
> ++							) {
> + 			struct ablkcipher_alg *alg;
> +
> + 			alg = &tfm->__crt_alg->cra_ablkcipher;
> --
> 2.20.1
>
>
> _______________________________________________
> openwrt-devel mailing list
> openwrt-devel at lists.openwrt.org
> https://lists.openwrt.org/mailman/listinfo/openwrt-devel

_______________________________________________
openwrt-devel mailing list
openwrt-devel at lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel