Home Home > GIT Browse > SLE12-SP4
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPetr Tesarik <ptesarik@suse.cz>2019-10-17 10:18:31 +0200
committerPetr Tesarik <ptesarik@suse.cz>2019-10-17 10:18:31 +0200
commit805df8f0e82f0b6d961e0da65823af29f80e8b08 (patch)
tree400cbaab6e87476dda58d8c0fbe70750b9bcff96
parent5f20deadda7c451d1c2541ac482c9ed26e3daf3c (diff)
parentafac1ff8465f13eed4ee9e4a7cffb98371cfabb5 (diff)
Merge branch 'users/oneukum/SLE15/for-next' into SLE15
Pull a USB fix from Oliver Neukum
-rw-r--r--patches.suse/0001-crypto-talitos-fix-missing-break-in-switch-statement.patch37
-rw-r--r--series.conf1
2 files changed, 38 insertions, 0 deletions
diff --git a/patches.suse/0001-crypto-talitos-fix-missing-break-in-switch-statement.patch b/patches.suse/0001-crypto-talitos-fix-missing-break-in-switch-statement.patch
new file mode 100644
index 0000000000..12bac3bf60
--- /dev/null
+++ b/patches.suse/0001-crypto-talitos-fix-missing-break-in-switch-statement.patch
@@ -0,0 +1,37 @@
+From 5fc194ea6d34dfad9833d3043ce41d6c52aff39a Mon Sep 17 00:00:00 2001
+From: "Gustavo A. R. Silva" <gustavo@embeddedor.com>
+Date: Mon, 9 Sep 2019 00:29:52 -0500
+Subject: [PATCH] crypto: talitos - fix missing break in switch statement
+Git-commit: 5fc194ea6d34dfad9833d3043ce41d6c52aff39a
+Patch-mainline: v5.4-rc1
+References: bsc#1142635
+
+Add missing break statement in order to prevent the code from falling
+through to case CRYPTO_ALG_TYPE_AHASH.
+
+Fixes: aeb4c132f33d ("crypto: talitos - Convert to new AEAD interface")
+Cc: stable@vger.kernel.org
+Reported-by: kbuild test robot <lkp@intel.com>
+Signed-off-by: Gustavo A. R. Silva <gustavo@embeddedor.com>
+Reviewed-by: Christophe Leroy <christophe.leroy@c-s.fr>
+Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
+Signed-off-by: Oliver Neukum <oneukum@suse.com>
+---
+ drivers/crypto/talitos.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/drivers/crypto/talitos.c b/drivers/crypto/talitos.c
+index cb6c10b1bf36..56e3068c9947 100644
+--- a/drivers/crypto/talitos.c
++++ b/drivers/crypto/talitos.c
+@@ -3116,6 +3116,7 @@ static int talitos_remove(struct platform_device *ofdev)
+ break;
+ case CRYPTO_ALG_TYPE_AEAD:
+ crypto_unregister_aead(&t_alg->algt.alg.aead);
++ break;
+ case CRYPTO_ALG_TYPE_AHASH:
+ crypto_unregister_ahash(&t_alg->algt.alg.hash);
+ break;
+--
+2.16.4
+
diff --git a/series.conf b/series.conf
index 38690a3152..e0f24bbddf 100644
--- a/series.conf
+++ b/series.conf
@@ -24763,6 +24763,7 @@
patches.suse/quota-fix-wrong-condition-in-is_quota_modification.patch
patches.suse/power-supply-Init-device-wakeup-after-device_add.patch
patches.suse/power-reset-gpio-restart-Fix-typo-when-gpio-reset-is.patch
+ patches.suse/0001-crypto-talitos-fix-missing-break-in-switch-statement.patch
patches.suse/hwrng-core-don-t-wait-on-add_early_randomness.patch
patches.suse/livepatch-nullify-obj-mod-in-klp_module_coming-s-error-path.patch
patches.suse/suse-hv-PCI-hv-Detect-and-fix-Hyper-V-PCI-domain-number-coll.patch