From 49cbaba302f002aa7f148631a76fc21a3069bc25 Mon Sep 17 00:00:00 2001
From: Ingo Franzki <ifranzki@linux.ibm.com>
Date: Wed, 12 Feb 2020 13:48:54 +0100
Subject: [PATCH] zkey: Fix display of clear key size for CCA-AESCIPHER keys
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Fixes: ddde3f354f35 ("zkey: Introduce the CCA-AESCIPHER key type")
Signed-off-by: Ingo Franzki <ifranzki@linux.ibm.com>
Signed-off-by: Jan Höppner <hoeppner@linux.ibm.com>
---
 zkey/pkey.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/zkey/pkey.c b/zkey/pkey.c
index f491f9d8..e21461ab 100644
--- a/zkey/pkey.c
+++ b/zkey/pkey.c
@@ -1649,9 +1649,9 @@ int get_key_bit_size(const u8 *key, size_t key_size, size_t *bitsize)
 			*bitsize = cipherkey->pl - 384;
 		else
 			*bitsize = 0; /* Unknown */
-		if (key_size > cipherkey->length) {
+		if (key_size == 2 * AESCIPHER_KEY_SIZE) {
 			cipherkey = (struct aescipherkeytoken *)(key +
-					cipherkey->length);
+					AESCIPHER_KEY_SIZE);
 			if (cipherkey->pfv == 0x00) /* V0 payload */
 				*bitsize += cipherkey->pl - 384;
 		}