From patchwork Sun Feb 7 14:39:41 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thara Gopinath X-Patchwork-Id: 378111 Delivered-To: patch@linaro.org Received: by 2002:a02:b18a:0:0:0:0:0 with SMTP id t10csp3953857jah; Sun, 7 Feb 2021 06:41:57 -0800 (PST) X-Google-Smtp-Source: ABdhPJy4rVXw9d2PABv/f5fK/1/sXHY0mcrBKe6c+L1GXV13x/QOXOddQSw7DJxD8aw6fPIY7DDZ X-Received: by 2002:a05:6402:34c3:: with SMTP id w3mr13209409edc.3.1612708917338; Sun, 07 Feb 2021 06:41:57 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1612708917; cv=none; d=google.com; s=arc-20160816; b=ZTeJkxtQ3K3q83D27UZzJHvAlLxF7WDYxj/LtdCj9+h7xw66fyGIpUoHtfGkbGZhdE s9zGlgl3okpUTW8qtMZLSVkZo/e9LKDOam1foyQnQW2X+ldIG/zfTqs+anI2aYzhHeZI o+MmhMtVH/Y3bNJLLXrbQk3D38SwOrSl1EwTh5emu5dkiZGVa31QI/khiTf+83lHa3el pB2Ij/aura3Tkt5GKxY0Hqyy7kEU0Ke2qEXT55/TGLqSiT31eGG6KZez6kuAv4iMrn6X vBHq5oANvHcXnS8Am6lwBTc1eYfimznkEah0bXhI/cn56SyRJbjKDnCPQc5ZcJpIJuvq Hjyw== 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=DZiqftGjZZeqxnGuzUfAaT6stfdHVGYnoCL8kLsn0Ng=; b=cK+lv5DHaqOd3NzRevoZtzgPWirPR86B7mLmTfn8JFbut3+mY32+e47OOiB9czx4Bj Rsn+71c432OU/cQJX4iFprZtqBCg54z2saVjODvo6WpLG7hzTzZQSk1TFjXXrljm6l3y aFHAX1bZ5KOtr66zhWE0CaX5ufVgD5U/6KXxazvexxoCrt1HP9Z4NDd2tzJhsrhp62l1 ruzpuuPZvMZTF/QgHl1kEoBVbnpvgr9Z0gLUkLYC3VVglZprJ00D2kP/tUCiBLSqYtrP xBHgU22mT2jPn/EDzyMHtou6IpKl2IfNRoA9OWErrQ4DGD0jdt3ie/cjeK8cAHnUFCVx ILGw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=HV2LKtCS; 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 g26si9550734edy.55.2021.02.07.06.41.57; Sun, 07 Feb 2021 06:41:57 -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=HV2LKtCS; 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 S229975AbhBGOlS (ORCPT + 2 others); Sun, 7 Feb 2021 09:41:18 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47886 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229892AbhBGOlM (ORCPT ); Sun, 7 Feb 2021 09:41:12 -0500 Received: from mail-qk1-x732.google.com (mail-qk1-x732.google.com [IPv6:2607:f8b0:4864:20::732]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 124A9C0617AA for ; Sun, 7 Feb 2021 06:39:54 -0800 (PST) Received: by mail-qk1-x732.google.com with SMTP id v206so277886qkb.3 for ; Sun, 07 Feb 2021 06:39:54 -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=DZiqftGjZZeqxnGuzUfAaT6stfdHVGYnoCL8kLsn0Ng=; b=HV2LKtCSh+i1BvBIs4cdUJkJ7QqIfp3lQD/DvNQHYyBC+hrpMdTYljRJiXIIcUyos5 K4LzMW38DczfHw5ppQpwECuSmoxypC+Tm1blEz3JnUaIkBZgUG3SvSCUcf/ZofzjHPex p7BYKI+7aArG29y6+g/GzRStkTLmuO2ZedWLsTKKvigu5zj2tkOolNiorSmuu7Tx8aF7 MbaMBDUh5R4EBNV2FMHBk1qImlb5ula8JpFnEKog46j9PCQd0lDwXvMUaXlYLeuzYg8r ky7ZzvOyJ56M956kGCf69h8iVMZjaJ61OwJbvKaTB0CFA6weUM5ilBd3dwOek7/6LF4c Jdgg== 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=DZiqftGjZZeqxnGuzUfAaT6stfdHVGYnoCL8kLsn0Ng=; b=Gz/C9qdmv67y6PYoFOUk8I7E5dOHPSkYN13GL4qzwmpXuH8EEkwLu36EDADtKgGLQU b6G7uRvLtvO0Dx8Ocg9qG0tP7RnVmqonJDmo1zSyOOg7dsbE76Pe3sut4gv+FGnE7ADC HfRBzj5vNhWuJrdT1XC8rVxRJmxSB9Z+ktiqpCQJk/BPD8gQ5b4xa9d2Xzcthwr/RdOB G9ZpyblVm/cyXEEGViNxuvDxefQAHeelWZJprjDpMAJHPkOP0NVWRV8W2KsaCWIavKQZ 736oS5znyDTriTziVAdSNVGil6YTiMHHVv55mGeSTdgqlG6nepNSlQzovMtojHIRHVme H3sw== X-Gm-Message-State: AOAM531FYCajEVwIK7P1vNMVGVJn+u1KT6KKTQB+XY3ZFEcTjoSGH9Gf QPj1jsa66omjpkhivgYMYCY3Mg== X-Received: by 2002:a37:6f06:: with SMTP id k6mr12929201qkc.458.1612708793337; Sun, 07 Feb 2021 06:39:53 -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 c81sm13941493qkb.88.2021.02.07.06.39.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 07 Feb 2021 06:39:52 -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 v6 06/11] crypto: qce: skcipher: Return error for non-blocksize data(ECB/CBC algorithms) Date: Sun, 7 Feb 2021 09:39:41 -0500 Message-Id: <20210207143946.2099859-7-thara.gopinath@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210207143946.2099859-1-thara.gopinath@linaro.org> References: <20210207143946.2099859-1-thara.gopinath@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-crypto@vger.kernel.org ECB/CBC encryption/decryption requires the data to be blocksize aligned. Crypto engine hangs on non-block sized operations for these algorithms. Return invalid data if data size is not blocksize aligned for these algorithms. Signed-off-by: Thara Gopinath --- v5->v6: - Remove the wrong TODO which implied that AES CBC can do partial block sizes when it is actually CTS mode that can as pointed out by Eric Biggers. drivers/crypto/qce/skcipher.c | 9 +++++++++ 1 file changed, 9 insertions(+) -- 2.25.1 diff --git a/drivers/crypto/qce/skcipher.c b/drivers/crypto/qce/skcipher.c index 96af40c2c8f3..d24d96ed5be9 100644 --- a/drivers/crypto/qce/skcipher.c +++ b/drivers/crypto/qce/skcipher.c @@ -254,6 +254,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; @@ -265,6 +266,14 @@ static int qce_skcipher_crypt(struct skcipher_request *req, int encrypt) if (!req->cryptlen) return 0; + /* + * ECB and CBC algorithms require message lengths to be + * multiples of block size. + */ + if (IS_ECB(rctx->flags) || IS_CBC(rctx->flags)) + if (!IS_ALIGNED(req->cryptlen, blocksize)) + return -EINVAL; + /* qce is hanging when AES-XTS request len > QCE_SECTOR_SIZE and * is not a multiple of it; pass such requests to the fallback */