Received: by 2002:a05:6a10:f347:0:0:0:0 with SMTP id d7csp2621938pxu; Fri, 18 Dec 2020 19:33:20 -0800 (PST) X-Google-Smtp-Source: ABdhPJzHLLkxFvNDkN7DveyAZkIm8X656XQ4xxlaaTVQhGi62xwtxyOJtYaLCnKswK2wLjDrBGw0 X-Received: by 2002:aa7:db56:: with SMTP id n22mr7526843edt.4.1608348800576; Fri, 18 Dec 2020 19:33:20 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1608348800; cv=none; d=google.com; s=arc-20160816; b=jLtIJks99HFk0RDDnarjAKoBgGv4XS7+G7LOmagfMQPMmXIxNFD7R5MQtXyv0gIhEH r/Gh3Lqw4gF3t4uX+Cxvr8fgMI/0xSEGT9cV+gX2i574NxardAGy8rps000cDkzM39Id YzHE+FPhPUPQPa7RLmswRjH8wcYU68XDhiNE+M6I+jUreCbDMPMnI3SCTBcR2WX9adHw eQMM4tN5dpfucOzoj1mfiJpKCpd9vd4d/EKxx50iE4U9aKSGw+CoS+TaMreQDHyzZfXT TjJJN7Vb6UdmaRgKXCU7GpRpzCKd3MayBHUYYU40VLATYtAuG+A+1jV5hwGN343ClCUV A0Xw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=bZGjT91YJf1hHkSmJvXhKwaeMO0DjPBWpAMf7imhySA=; b=NZE3ChcUvYp9GrprUYT+vIyQcgceKv9Miv1x0GN+Vm+Y+1KtHSoc2sFYqgaON6zzoS zdtLN7vw0VAipDx1GApG+hQRoc9VNfuMzrzss0M5BOi2833cgxnukruDTBAfEldfgFyK 8vQ/+XZMuMWyhJejNLJd5IxMmdO/v4OqI8GS76V+EqG1xRbSamY0GWCYcJp/0oADjTR6 H6Z9KQnx4stVS9/JqalGpjcGEEJqa1dZfB0XUsYZgke5F3+at/xMBpuNDy6weyMt1UN9 D+4h+Ce7y1HynUjSymrTX1b66yDUmI3VnemgPq02TrUp1md4hqsZ4gRMrYrWZCFJ6Lfg mROg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=NEZrJXeG; spf=pass (google.com: domain of linux-crypto-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-crypto-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id k3si7415137edr.372.2020.12.18.19.33.01; Fri, 18 Dec 2020 19:33:20 -0800 (PST) Received-SPF: pass (google.com: domain of linux-crypto-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=NEZrJXeG; spf=pass (google.com: domain of linux-crypto-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-crypto-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726216AbgLSDbu (ORCPT + 99 others); Fri, 18 Dec 2020 22:31:50 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38722 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726132AbgLSDbu (ORCPT ); Fri, 18 Dec 2020 22:31:50 -0500 Received: from mail-qt1-x82e.google.com (mail-qt1-x82e.google.com [IPv6:2607:f8b0:4864:20::82e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0FB66C0611CA for ; Fri, 18 Dec 2020 19:30:33 -0800 (PST) Received: by mail-qt1-x82e.google.com with SMTP id z9so2902250qtn.4 for ; Fri, 18 Dec 2020 19:30:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=bZGjT91YJf1hHkSmJvXhKwaeMO0DjPBWpAMf7imhySA=; b=NEZrJXeG2hjCpLFDoS6wspfHNBQW3U7bK2mfIPyudAunW8Aha0vsICIkkB9HseUh25 L7Yj6UfY/BJvD/9UhqZZg70j6zdmDdOlrSf0OvOfr026YxwJnJCwrzJRqh96dLW8mzXR lHdppUcv9D1EuylMSSsnNBZ4jzYYxerJVy4q8xNTrcbuQuJrXaWF0YpO+QWzzlJQnJWs eE14CszJZUhYhzRHE/3k7H/b9MNkTkpL3ixGA1gn04EOScb/YzbhGxUwZ7Q7fnVzy7go Hh/GwQsZHpSk0+1A4u1kpahARxzesStefZjyUHiv6EjvxaVtl836mC869cbkYtK6npQs LVDQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=bZGjT91YJf1hHkSmJvXhKwaeMO0DjPBWpAMf7imhySA=; b=D8ohFRBJafAryLro8xfdPbSwCShGmFn1fw3mGnJOcxCvhFF/ywlVqVznpXglq8b91+ Pxk6y96RYug1RsBYS9SNd06qxOkVAdycX0m835SwxS0dl9Clu+smjcL/fLNT5S2rvZ1m hfsPOsbGpPy3rtqdgyb2Rz/BnGRYB/gQGgkXJ9Cuh7Jrt9fjud1WZJSfwQw1/tRTM8rV PJmD959rY6SQCArr6cdmWdL3JcR50pa+FCK+okJBFulMi25hFwzKjMjrv1ygb9VnoPTJ UQsfF3DVyalaKrWgxFhTcwpl14QYDbNuLZ3Vh1lPD+SGny/xkPhU1IAzxAxyyuUEiYvD NLZw== X-Gm-Message-State: AOAM5329X8sb6gACCXkjfNhFHmP8vtCcXYe+v1WVSjEELn5MtktW9gcU JbH1KhtlTgMa+4cnmZarFNJrHA== X-Received: by 2002:ac8:5747:: with SMTP id 7mr7042392qtx.177.1608348632261; Fri, 18 Dec 2020 19:30:32 -0800 (PST) Received: from pop-os.fios-router.home (pool-71-163-245-5.washdc.fios.verizon.net. [71.163.245.5]) by smtp.googlemail.com with ESMTPSA id y16sm4376045qki.132.2020.12.18.19.30.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 18 Dec 2020 19:30:31 -0800 (PST) From: Thara Gopinath To: herbert@gondor.apana.org.au, davem@davemloft.net, bjorn.andersson@linaro.org Cc: ebiggers@google.com, ardb@kernel.org, sivaprak@codeaurora.org, linux-crypto@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 3/6] drivers: crypto: qce: skcipher: Fix regressions found during fuzz testing Date: Fri, 18 Dec 2020 22:30:24 -0500 Message-Id: <20201219033027.3066042-4-thara.gopinath@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20201219033027.3066042-1-thara.gopinath@linaro.org> References: <20201219033027.3066042-1-thara.gopinath@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-crypto@vger.kernel.org This patch contains the following fixes for the supported encryption algorithms in the Qualcomm crypto engine(CE) 1. Return unsupported if key1 = key2 for AES XTS algorithm since CE does not support this and the operation causes the engine to hang. 2. Return unsupprted if any three keys are same for DES3 algorithms since CE does not support this and the operation causes the engine to hang. 3. Return unsupported for 0 length plain texts since crypto engine BAM dma does not support 0 length data. 4. ECB messages do not have an IV and hence set the ivsize to 0. 5. Ensure that the data passed for ECB/CBC encryption/decryption is blocksize aligned. Otherwise the CE hangs on the operation. 6. Allow messages of length less that 512 bytes for all other encryption algorithms other than AES XTS. The recommendation is only for AES XTS to have data size greater than 512 bytes. Signed-off-by: Thara Gopinath --- drivers/crypto/qce/skcipher.c | 68 ++++++++++++++++++++++++++++++----- 1 file changed, 60 insertions(+), 8 deletions(-) diff --git a/drivers/crypto/qce/skcipher.c b/drivers/crypto/qce/skcipher.c index a2d3da0ad95f..936bfb7c769b 100644 --- a/drivers/crypto/qce/skcipher.c +++ b/drivers/crypto/qce/skcipher.c @@ -167,16 +167,32 @@ static int qce_skcipher_setkey(struct crypto_skcipher *ablk, const u8 *key, struct crypto_tfm *tfm = crypto_skcipher_tfm(ablk); struct qce_cipher_ctx *ctx = crypto_tfm_ctx(tfm); unsigned long flags = to_cipher_tmpl(ablk)->alg_flags; + unsigned int __keylen; int ret; if (!key || !keylen) return -EINVAL; - switch (IS_XTS(flags) ? keylen >> 1 : keylen) { + /* + * AES XTS key1 = key2 not supported by crypto engine. + * Revisit to request a fallback cipher in this case. + */ + if (IS_XTS(flags)) { + __keylen = keylen >> 1; + if (!memcmp(key, key + __keylen, __keylen)) + return -EINVAL; + } else { + __keylen = keylen; + } + switch (__keylen) { case AES_KEYSIZE_128: case AES_KEYSIZE_256: memcpy(ctx->enc_key, key, keylen); break; + case AES_KEYSIZE_192: + break; + default: + return -EINVAL; } ret = crypto_skcipher_setkey(ctx->fallback, key, keylen); @@ -204,12 +220,27 @@ static int qce_des3_setkey(struct crypto_skcipher *ablk, const u8 *key, unsigned int keylen) { struct qce_cipher_ctx *ctx = crypto_skcipher_ctx(ablk); + u32 _key[6]; int err; err = verify_skcipher_des3_key(ablk, key); if (err) return err; + /* + * The crypto engine does not support any two keys + * being the same for triple des algorithms. The + * verify_skcipher_des3_key does not check for all the + * below conditions. Return -ENOKEY in case any two keys + * are the same. Revisit to see if a fallback cipher + * is needed to handle this condition. + */ + memcpy(_key, key, DES3_EDE_KEY_SIZE); + if (!((_key[0] ^ _key[2]) | (_key[1] ^ _key[3])) || + !((_key[2] ^ _key[4]) | (_key[3] ^ _key[5])) || + !((_key[0] ^ _key[4]) | (_key[1] ^ _key[5]))) + return -ENOKEY; + ctx->enc_keylen = keylen; memcpy(ctx->enc_key, key, keylen); return 0; @@ -221,6 +252,7 @@ static int qce_skcipher_crypt(struct skcipher_request *req, int encrypt) struct qce_cipher_ctx *ctx = crypto_skcipher_ctx(tfm); struct qce_cipher_reqctx *rctx = skcipher_request_ctx(req); struct qce_alg_template *tmpl = to_cipher_tmpl(tfm); + unsigned int blocksize = crypto_skcipher_blocksize(tfm); int keylen; int ret; @@ -228,14 +260,34 @@ static int qce_skcipher_crypt(struct skcipher_request *req, int encrypt) rctx->flags |= encrypt ? QCE_ENCRYPT : QCE_DECRYPT; keylen = IS_XTS(rctx->flags) ? ctx->enc_keylen >> 1 : ctx->enc_keylen; - /* qce is hanging when AES-XTS request len > QCE_SECTOR_SIZE and - * is not a multiple of it; pass such requests to the fallback + /* CE does not handle 0 length messages */ + if (!req->cryptlen) + return -EINVAL; + + /* + * ECB and CBC algorithms require message lengths to be + * multiples of block size. + * TODO: The spec says AES CBC mode for certain versions + * of crypto engine can handle partial blocks as well. + * Test and enable such messages. + */ + if (IS_ECB(rctx->flags) || IS_CBC(rctx->flags)) + if (!IS_ALIGNED(req->cryptlen, blocksize)) + return -EINVAL; + + /* + * Conditions for requesting a fallback cipher + * AES-192 (not supported by crypto engine (CE)) + * AES-XTS request with len <= 512 byte (not recommended to use CE) + * AES-XTS request with len > QCE_SECTOR_SIZE and + * is not a multiple of it.(Revisit this condition to check if it is + * needed in all versions of CE) */ if (IS_AES(rctx->flags) && - (((keylen != AES_KEYSIZE_128 && keylen != AES_KEYSIZE_256) || - req->cryptlen <= aes_sw_max_len) || - (IS_XTS(rctx->flags) && req->cryptlen > QCE_SECTOR_SIZE && - req->cryptlen % QCE_SECTOR_SIZE))) { + ((keylen != AES_KEYSIZE_128 && keylen != AES_KEYSIZE_256) || + (IS_XTS(rctx->flags) && ((req->cryptlen <= aes_sw_max_len) || + (req->cryptlen > QCE_SECTOR_SIZE && + req->cryptlen % QCE_SECTOR_SIZE))))) { skcipher_request_set_tfm(&rctx->fallback_req, ctx->fallback); skcipher_request_set_callback(&rctx->fallback_req, req->base.flags, @@ -307,7 +359,7 @@ static const struct qce_skcipher_def skcipher_def[] = { .name = "ecb(aes)", .drv_name = "ecb-aes-qce", .blocksize = AES_BLOCK_SIZE, - .ivsize = AES_BLOCK_SIZE, + .ivsize = 0, .min_keysize = AES_MIN_KEY_SIZE, .max_keysize = AES_MAX_KEY_SIZE, }, -- 2.25.1