From: Holger Dengler <dengler@linux.ibm.com>
Date: Fri, 11 Oct 2024 08:48:00 +0000 (+0200)
Subject: s390/pkey_pckmo: Return with success for valid protected key types
X-Git-Tag: v6.12-rc4~30^2~4
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9b52ddeb468c74db7f652f7ac5a390591bb47dc7;p=thirdparty%2Fkernel%2Flinux.git

s390/pkey_pckmo: Return with success for valid protected key types

The key_to_protkey handler function in module pkey_pckmo should return
with success on all known protected key types, including the new types
introduced by fd197556eef5 ("s390/pkey: Add AES xts and HMAC clear key
token support").

Fixes: fd197556eef5 ("s390/pkey: Add AES xts and HMAC clear key token support")
Signed-off-by: Holger Dengler <dengler@linux.ibm.com>
Reviewed-by: Ingo Franzki <ifranzki@linux.ibm.com>
Signed-off-by: Heiko Carstens <hca@linux.ibm.com>
---

diff --git a/drivers/s390/crypto/pkey_pckmo.c b/drivers/s390/crypto/pkey_pckmo.c
index 98079b1ed6db8..beeca8827c464 100644
--- a/drivers/s390/crypto/pkey_pckmo.c
+++ b/drivers/s390/crypto/pkey_pckmo.c
@@ -324,6 +324,7 @@ static int pckmo_key2protkey(const u8 *key, u32 keylen,
 		memcpy(protkey, t->protkey, t->len);
 		*protkeylen = t->len;
 		*protkeytype = t->keytype;
+		rc = 0;
 		break;
 	}
 	case TOKVER_CLEAR_KEY: {