Home Home > GIT Browse > SLE12-SP4
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2019-07-16 14:46:35 +0200
committerTakashi Iwai <tiwai@suse.de>2019-07-16 14:47:00 +0200
commitd1d286161e4697a68c043f89687bbbc2911f3796 (patch)
tree574fef4943598ae7e0baca7da3d9e0b821c53f49
parent02deed1b8ac5f404be93e30ba059d377c8303996 (diff)
crypto: talitos - HMAC SNOOP NO AFEU mode requires SW icv
checking (bsc#1051510).
-rw-r--r--patches.fixes/crypto-talitos-HMAC-SNOOP-NO-AFEU-mode-requires-SW-i.patch36
-rw-r--r--series.conf1
2 files changed, 37 insertions, 0 deletions
diff --git a/patches.fixes/crypto-talitos-HMAC-SNOOP-NO-AFEU-mode-requires-SW-i.patch b/patches.fixes/crypto-talitos-HMAC-SNOOP-NO-AFEU-mode-requires-SW-i.patch
new file mode 100644
index 0000000000..ad38def116
--- /dev/null
+++ b/patches.fixes/crypto-talitos-HMAC-SNOOP-NO-AFEU-mode-requires-SW-i.patch
@@ -0,0 +1,36 @@
+From 4bbfb839259a9c96a0be872e16f7471b7136aee5 Mon Sep 17 00:00:00 2001
+From: Christophe Leroy <christophe.leroy@c-s.fr>
+Date: Tue, 21 May 2019 13:34:15 +0000
+Subject: [PATCH] crypto: talitos - HMAC SNOOP NO AFEU mode requires SW icv checking.
+Git-commit: 4bbfb839259a9c96a0be872e16f7471b7136aee5
+Patch-mainline: v5.3-rc1
+References: bsc#1051510
+
+In that mode, hardware ICV verification is not supported.
+
+Signed-off-by: Christophe Leroy <christophe.leroy@c-s.fr>
+Fixes: 7405c8d7ff97 ("crypto: talitos - templates for AEAD using HMAC_SNOOP_NO_AFEU")
+Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
+Acked-by: Takashi Iwai <tiwai@suse.de>
+
+---
+ drivers/crypto/talitos.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/drivers/crypto/talitos.c b/drivers/crypto/talitos.c
+index a15aa6d6ec33..e35581d67315 100644
+--- a/drivers/crypto/talitos.c
++++ b/drivers/crypto/talitos.c
+@@ -1545,7 +1545,8 @@ static int aead_decrypt(struct aead_request *req)
+ if (IS_ERR(edesc))
+ return PTR_ERR(edesc);
+
+- if ((priv->features & TALITOS_FTR_HW_AUTH_CHECK) &&
++ if ((edesc->desc.hdr & DESC_HDR_TYPE_IPSEC_ESP) &&
++ (priv->features & TALITOS_FTR_HW_AUTH_CHECK) &&
+ ((!edesc->src_nents && !edesc->dst_nents) ||
+ priv->features & TALITOS_FTR_SRC_LINK_TBL_LEN_INCLUDES_EXTENT)) {
+
+--
+2.16.4
+
diff --git a/series.conf b/series.conf
index 7e5ff5b027..47ca937300 100644
--- a/series.conf
+++ b/series.conf
@@ -22819,6 +22819,7 @@
patches.fixes/crypto-talitos-reduce-max-key-size-for-SEC1.patch
patches.fixes/crypto-talitos-fix-CTR-alg-blocksize.patch
patches.fixes/crypto-talitos-check-data-blocksize-in-ablkcipher.patch
+ patches.fixes/crypto-talitos-HMAC-SNOOP-NO-AFEU-mode-requires-SW-i.patch
patches.fixes/lib-scatterlist-Fix-mapping-iterator-when-sg-offset-.patch
patches.drivers/pwm-stm32-Use-3-cells-of_xlate.patch
patches.drivers/gpio-omap-fix-lack-of-irqstatus_raw0-for-OMAP4.patch