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

holger-dengler · hcahca · commit 9b52ddeb468c · 2024-10-16T11:32:32.000+02:00
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 fd19755 ("s390/pkey: Add AES xts and HMAC clear key token support"). Fixes: fd19755 ("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
@@ -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: {

Original file line number	Diff line number	Diff line change
`@@ -324,6 +324,7 @@ static int pckmo_key2protkey(const u8 *key, u32 keylen,`
`324`	`324`	`memcpy(protkey, t->protkey, t->len);`
`325`	`325`	`*protkeylen = t->len;`
`326`	`326`	`*protkeytype = t->keytype;`
	`327`	`+ rc = 0;`
`327`	`328`	`break;`
`328`	`329`	`}`
`329`	`330`	`case TOKVER_CLEAR_KEY: {`