summaryrefslogtreecommitdiffstats
path: root/meta/recipes-kernel
diff options
context:
space:
mode:
authorKai Kang <kai.kang@windriver.com>2019-04-25 01:40:31 -0400
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-04-26 10:09:08 +0100
commit63c59122475189b44e20c6789e6e9a8f26a9e15f (patch)
tree996009c45d7980db0948ac9adacefc6b0b3d239f /meta/recipes-kernel
parentdac764b6e2a8063ebd0b81681056653d10ecb4bf (diff)
downloadpoky-63c59122475189b44e20c6789e6e9a8f26a9e15f.tar.gz
cryptodev: fix module loading error
Backport patch from upstream to fix module cryptodev loading error. (From OE-Core rev: 66c446f96a0f26f3895cc930c5e5ee2d033489ca) Signed-off-by: Kai Kang <kai.kang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-kernel')
-rw-r--r--meta/recipes-kernel/cryptodev/cryptodev.inc4
-rw-r--r--meta/recipes-kernel/cryptodev/files/0001-Fix-module-loading-with-Linux-v5.0-rc5.patch59
2 files changed, 62 insertions, 1 deletions
diff --git a/meta/recipes-kernel/cryptodev/cryptodev.inc b/meta/recipes-kernel/cryptodev/cryptodev.inc
index 252d39d23a..9d8ba44058 100644
--- a/meta/recipes-kernel/cryptodev/cryptodev.inc
+++ b/meta/recipes-kernel/cryptodev/cryptodev.inc
@@ -3,7 +3,9 @@ HOMEPAGE = "http://cryptodev-linux.org/"
3LICENSE = "GPLv2" 3LICENSE = "GPLv2"
4LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" 4LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
5 5
6SRC_URI = "git://github.com/cryptodev-linux/cryptodev-linux" 6SRC_URI = "git://github.com/cryptodev-linux/cryptodev-linux \
7 file://0001-Fix-module-loading-with-Linux-v5.0-rc5.patch \
8 "
7SRCREV = "fd8b15ef1c8398a69a37932ee48c74ab40329a29" 9SRCREV = "fd8b15ef1c8398a69a37932ee48c74ab40329a29"
8 10
9S = "${WORKDIR}/git" 11S = "${WORKDIR}/git"
diff --git a/meta/recipes-kernel/cryptodev/files/0001-Fix-module-loading-with-Linux-v5.0-rc5.patch b/meta/recipes-kernel/cryptodev/files/0001-Fix-module-loading-with-Linux-v5.0-rc5.patch
new file mode 100644
index 0000000000..34ec87272f
--- /dev/null
+++ b/meta/recipes-kernel/cryptodev/files/0001-Fix-module-loading-with-Linux-v5.0-rc5.patch
@@ -0,0 +1,59 @@
1Upstream-Status: Backport [https://github.com/cryptodev-linux/cryptodev-linux/commit/f971e0c]
2
3Backport patch from upstream to fix module cryptodev loading error.
4
5Signed-off-by: Kai Kang <kai.kang@windriver.com>
6
7From f971e0cd4a0ebe59fb2e8e17240399bf6901b09b Mon Sep 17 00:00:00 2001
8From: "Derald D. Woods" <woods.technical@gmail.com>
9Date: Sun, 10 Feb 2019 13:22:19 -0600
10Subject: [PATCH] Fix module loading with Linux v5.0-rc5
11
12This commit fixes this module load error:
13[...]
14[ 29.112091] cryptodev: loading out-of-tree module taints kernel.
15[ 29.128906] cryptodev: Unknown symbol crypto_givcipher_type (err -2)
16[ 29.188842] cryptodev: Unknown symbol crypto_givcipher_type (err -2)
17modprobe: can't load module cryptodev (extra/cryptodev.ko): unknown symbol in module, or unknown parameter
18[...]
19
20Upstream Linux support for unused GIVCIPHER, and others, was dropped here:
21
22c79b411eaa72 (crypto: skcipher - remove remnants of internal IV generators)
23
24Signed-off-by: Derald D. Woods <woods.technical@gmail.com>
25---
26 cryptlib.c | 9 +++++++--
27 1 file changed, 7 insertions(+), 2 deletions(-)
28
29diff --git a/cryptlib.c b/cryptlib.c
30index 6e66698..4a87037 100644
31--- a/cryptlib.c
32+++ b/cryptlib.c
33@@ -38,7 +38,9 @@
34 #include "cryptodev_int.h"
35 #include "cipherapi.h"
36
37+#if (LINUX_VERSION_CODE < KERNEL_VERSION(5, 0, 0))
38 extern const struct crypto_type crypto_givcipher_type;
39+#endif
40
41 static void cryptodev_complete(struct crypto_async_request *req, int err)
42 {
43@@ -157,8 +159,11 @@ int cryptodev_cipher_init(struct cipher_data *out, const char *alg_name,
44
45 #if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 8, 0))
46 tfm = crypto_skcipher_tfm(out->async.s);
47- if ((tfm->__crt_alg->cra_type == &crypto_ablkcipher_type) ||
48- (tfm->__crt_alg->cra_type == &crypto_givcipher_type)) {
49+ if ((tfm->__crt_alg->cra_type == &crypto_ablkcipher_type)
50+#if (LINUX_VERSION_CODE < KERNEL_VERSION(5, 0, 0))
51+ || (tfm->__crt_alg->cra_type == &crypto_givcipher_type)
52+#endif
53+ ) {
54 struct ablkcipher_alg *alg;
55
56 alg = &tfm->__crt_alg->cra_ablkcipher;
57--
582.20.0
59