1 files changed, 6 insertions, 5 deletions

diff --git a/arch/s390/crypto/des_s390.c b/arch/s390/crypto/des_s390.c
index 4aba83b31596..2bc479ab3a66 100644
--- a/arch/s390/crypto/des_s390.c
+++ b/arch/s390/crypto/des_s390.c
@@ -250,8 +250,9 @@ static int des3_128_setkey(struct crypto_tfm *tfm, const u8 *key,
         const u8 *temp_key = key;
         u32 *flags = &tfm->crt_flags;
 
-        if (!(memcmp(key, &key[DES_KEY_SIZE], DES_KEY_SIZE))) {
-                *flags |= CRYPTO_TFM_RES_BAD_KEY_SCHED;
+        if (!(memcmp(key, &key[DES_KEY_SIZE], DES_KEY_SIZE)) &&
+            (*flags & CRYPTO_TFM_REQ_WEAK_KEY)) {
+                *flags |= CRYPTO_TFM_RES_WEAK_KEY;
                 return -EINVAL;
         }
         for (i = 0; i < 2; i++, temp_key += DES_KEY_SIZE) {
@@ -411,9 +412,9 @@ static int des3_192_setkey(struct crypto_tfm *tfm, const u8 *key,
 
         if (!(memcmp(key, &key[DES_KEY_SIZE], DES_KEY_SIZE) &&
             memcmp(&key[DES_KEY_SIZE], &key[DES_KEY_SIZE * 2],
-                   DES_KEY_SIZE))) {
-
-                *flags |= CRYPTO_TFM_RES_BAD_KEY_SCHED;
+                   DES_KEY_SIZE)) &&
+            (*flags & CRYPTO_TFM_REQ_WEAK_KEY)) {
+                *flags |= CRYPTO_TFM_RES_WEAK_KEY;
                 return -EINVAL;
         }
         for (i = 0; i < 3; i++, temp_key += DES_KEY_SIZE) {