From nobody Tue Feb 10 01:58:57 2026 Received: from mail.loongson.cn (mail.loongson.cn [114.242.206.163]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 0B6662FF66C; Thu, 18 Dec 2025 03:49:03 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=114.242.206.163 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1766029746; cv=none; b=BPlO2qbXXA9N7LORjBYfIakssKQEW1xz/x2MUthI7o6hFa5Yv3ugWqm5x7ClAdBGyEFpwR8FoPy0eF8chIGeZebsF2lLRiDvO7qNf9NJd3Qp9h9fDfwQzUJ+whpxekTArI5+72t7Xv8x3FJTxdF5wyG6xcPIHv1auqko32G0Xxc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1766029746; c=relaxed/simple; bh=/DzPOaejdGgvEMqODqPQFsVL3+JPFrDYmIxvR3E+52k=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=kL6GfAmXkaftaU9+DauCh0woZqlvJOQv+AX9ZuPRLqiHt6acoiznTm655p9TgiVoa1iV61BtU/EcOMEIouXU9H2Oric2bQLVr8dOl2NJNalzIsa+2uYRllQxFUDAKq/MsNGO4HiH1if1uwiEPIXWEBsLAoG/uc7jZxTa7iytb+Q= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=loongson.cn; spf=pass smtp.mailfrom=loongson.cn; arc=none smtp.client-ip=114.242.206.163 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=loongson.cn Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=loongson.cn Received: from loongson.cn (unknown [10.2.5.213]) by gateway (Coremail) with SMTP id _____8DxPMOreUNpj1wAAA--.1016S3; Thu, 18 Dec 2025 11:48:59 +0800 (CST) Received: from localhost.localdomain (unknown [10.2.5.213]) by front1 (Coremail) with SMTP id qMiowJAxXcKpeUNpwS4BAA--.2172S3; Thu, 18 Dec 2025 11:48:58 +0800 (CST) From: Bibo Mao To: Gonglei , "Michael S . Tsirkin" , Jason Wang , Eric Biggers , Xuan Zhuo , =?UTF-8?q?Eugenio=20P=C3=A9rez?= , Herbert Xu , "David S. Miller" Cc: linux-kernel@vger.kernel.org, kvm@vger.kernel.org, linux-crypto@vger.kernel.org, virtualization@lists.linux.dev Subject: [PATCH v4 5/9] crypto: virtio: Use generic API aes_check_keylen() Date: Thu, 18 Dec 2025 11:48:42 +0800 Message-Id: <20251218034846.948860-6-maobibo@loongson.cn> X-Mailer: git-send-email 2.39.3 In-Reply-To: <20251218034846.948860-1-maobibo@loongson.cn> References: <20251218034846.948860-1-maobibo@loongson.cn> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-CM-TRANSID: qMiowJAxXcKpeUNpwS4BAA--.2172S3 X-CM-SenderInfo: xpdruxter6z05rqj20fqof0/ X-Coremail-Antispam: 1Uk129KBjDUn29KB7ZKAUJUUUUU529EdanIXcx71UUUUU7KY7 ZEXasCq-sGcSsGvfJ3UbIjqfuFe4nvWSU5nxnvy29KBjDU0xBIdaVrnUUvcSsGvfC2Kfnx nUUI43ZEXa7xR_UUUUUUUUU== Content-Type: text/plain; charset="utf-8" With AES algo, generic API aes_check_keylen() is used to check length of key. Signed-off-by: Bibo Mao --- .../virtio/virtio_crypto_skcipher_algs.c | 20 ++++++++----------- 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/drivers/crypto/virtio/virtio_crypto_skcipher_algs.c b/drivers/= crypto/virtio/virtio_crypto_skcipher_algs.c index 8a139de3d064..682d192a4ed7 100644 --- a/drivers/crypto/virtio/virtio_crypto_skcipher_algs.c +++ b/drivers/crypto/virtio/virtio_crypto_skcipher_algs.c @@ -94,18 +94,16 @@ static u64 virtio_crypto_alg_sg_nents_length(struct sca= tterlist *sg) } =20 static int -virtio_crypto_alg_validate_key(int key_len, uint32_t *alg) +virtio_crypto_alg_validate_key(int key_len, uint32_t alg) { - switch (key_len) { - case AES_KEYSIZE_128: - case AES_KEYSIZE_192: - case AES_KEYSIZE_256: - *alg =3D VIRTIO_CRYPTO_CIPHER_AES_CBC; - break; + switch (alg) { + case VIRTIO_CRYPTO_CIPHER_AES_ECB: + case VIRTIO_CRYPTO_CIPHER_AES_CBC: + case VIRTIO_CRYPTO_CIPHER_AES_CTR: + return aes_check_keylen(key_len); default: return -EINVAL; } - return 0; } =20 static int virtio_crypto_alg_skcipher_init_session( @@ -248,7 +246,6 @@ static int virtio_crypto_alg_skcipher_init_sessions( struct virtio_crypto_skcipher_ctx *ctx, const uint8_t *key, unsigned int keylen) { - uint32_t alg; int ret; struct virtio_crypto *vcrypto =3D ctx->vcrypto; =20 @@ -257,7 +254,7 @@ static int virtio_crypto_alg_skcipher_init_sessions( return -EINVAL; } =20 - if (virtio_crypto_alg_validate_key(keylen, &alg)) + if (virtio_crypto_alg_validate_key(keylen, ctx->alg->algonum)) return -EINVAL; =20 /* Create encryption session */ @@ -279,10 +276,9 @@ static int virtio_crypto_skcipher_setkey(struct crypto= _skcipher *tfm, unsigned int keylen) { struct virtio_crypto_skcipher_ctx *ctx =3D crypto_skcipher_ctx(tfm); - uint32_t alg; int ret; =20 - ret =3D virtio_crypto_alg_validate_key(keylen, &alg); + ret =3D virtio_crypto_alg_validate_key(keylen, ctx->alg->algonum); if (ret) return ret; =20 --=20 2.39.3