Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
From:   Andrei Botila <andrei.botila@oss.nxp.com>
To:     Horia Geanta <horia.geanta@nxp.com>,
        Aymen Sghaier <aymen.sghaier@nxp.com>,
        Herbert Xu <herbert@gondor.apana.org.au>,
        "David S. Miller" <davem@davemloft.net>
Cc:     linux-crypto@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH 4/9] crypto: caam/jr - add support for more XTS key lengths
Date:   Thu,  6 Aug 2020 14:41:22 +0300
Message-Id: <20200806114127.8650-5-andrei.botila@oss.nxp.com>
In-Reply-To: <20200806114127.8650-1-andrei.botila@oss.nxp.com>
References: <20200806114127.8650-1-andrei.botila@oss.nxp.com>
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-MessageSentRepresentingType: 1
Received: from lsv15007.swis.ro-buh01.nxp.com (83.217.231.2) by AM0PR06CA0101.eurprd06.prod.outlook.com (2603:10a6:208:fa::42) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3261.18 via Frontend Transport; Thu, 6 Aug 2020 11:41:52 +0000
X-Mailer: git-send-email 2.17.1
X-Originating-IP: [83.217.231.2]
X-MS-PublicTrafficType: Email
X-MS-Office365-Filtering-HT: Tenant
X-MS-Office365-Filtering-Correlation-Id: c83ebc0e-84fc-4fce-3d29-08d839fdb6eb
X-MS-TrafficTypeDiagnostic: VI1PR0402MB3440:
X-MS-Exchange-SharedMailbox-RoutingAgent-Processed: True
X-MS-Exchange-Transport-Forked: True
X-Microsoft-Antispam-PRVS: <VI1PR0402MB3440E1B337CA4BAD2024E578B4480@VI1PR0402MB3440.eurprd04.prod.outlook.com>
X-MS-Oob-TLC-OOBClassifiers: OLM:4941;
X-MS-Exchange-SenderADCheck: 1
X-Microsoft-Antispam: BCL:0;
X-Microsoft-Antispam-Message-Info: hRcQCOVPpv3UYMQdCDUiU2o/NHClzY/bGYQs06S6oqedVcnARZF3QiWNXLhxIb1R6qi8zz8khb9yccOrwvzb1MTIAER+ixXcS7kR60koe84mY5UYjBhqfyW6+BJYRx0zzXcEvT2u8VpI0inHtUEUFJOMwHNFo0/qmGv3wmlFOrskSKLJfLU4EchD2MJLA5SXx84hOE85YIyaOJsAQyIypCANpYaDy1hIr8kYFEJ36+mrED0y2fvLI7DPWjtobiuJqVhSFPHYYByUxMmgzXPD/JkGTP6xwGSmG/P7jLzn/K/6AIoMKCyY28eoaxYLPo0pI4bqZ912cdAsHi21p58fzQ==
X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:VE1PR04MB6608.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFTY:;SFS:(4636009)(366004)(396003)(376002)(39860400002)(346002)(136003)(110136005)(316002)(6666004)(6512007)(478600001)(956004)(2616005)(6486002)(4326008)(1076003)(44832011)(52116002)(6506007)(86362001)(186003)(26005)(16526019)(66556008)(66476007)(2906002)(66946007)(83380400001)(8676002)(5660300002)(8936002);DIR:OUT;SFP:1101;
X-MS-Exchange-AntiSpam-MessageData: o5KARerUuRYhj6p3NyKwwzS/BgOsH7f0QgxlxcDXdSMp+NYABYrayk2rjZL0k+K/Z5Q4/W1h7iYMV1/cmaW6HTeHghJMlFVsqE9mh1437JHX6boajSGAdUJlKiAFydD4ymhcFfoiTC65sSQUdXtcO4V0W5UBg+56Ts7KRLM45b8bzYcv17P6YjHWDI39I2b1J1+e5WcOPXrWdvWREhfOemY8TaB3+hSWRzO4taZHWg3JS25YEPos6IX9nC6Js0Dfh5dscugFWZOwLjFrPL/UFek7fVoX7f/6wTdnzE7GoUzjbe6eI3YFciFglk9CDMFt5r9YQZw6UxYT/VgBXRe1x4FkhA6bPrBUrUlXiejc7uloBKyLJptMy/wSfwOkB0XAFfr+hU89AFOAM/eqx+m123sgv7+0663m+jS94NWL44iAYDvlN6Vj6g6n1PfM40+/2sCoPsEF0hUrmSN1Klv9XgPlGfUDKpwRBXnvumufMLrs4LLK+KXjGBI/h+OyovbqqA5der0pTJyU/p0k1/+bTMWn+kIUMliS6q65/aAOynh0Fe2TYsghKOw8oGx0KbAsSDbnLQk+bd3strBXcrEno+wapgKeAtuow1YCfn/zKFQVsyJPjCIWnWmnkqPFhRDobbuO1s3DReeWNBj88wONEA==
X-OriginatorOrg: oss.nxp.com
X-MS-Exchange-CrossTenant-Network-Message-Id: c83ebc0e-84fc-4fce-3d29-08d839fdb6eb
X-MS-Exchange-CrossTenant-AuthSource: VE1PR04MB6608.eurprd04.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Aug 2020 11:41:53.2843
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: 1Xhm7QUE7mr9kiZZ0LkaaGoGRaYQG0OAqKFENIWUvmz3XSh5lXhAfeGNv2dOD+7+yFpyKJ8JnPYV6cRq9BKvjw==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR0402MB3440
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

From: Andrei Botila <andrei.botila@nxp.com>

CAAM accelerator only supports XTS-AES-128 and XTS-AES-256 since
it adheres strictly to the standard. All the other key lengths
are accepted and processed through a fallback as long as they pass
the xts_verify_key() checks.

Fixes: c6415a6016bf ("crypto: caam - add support for acipher xts(aes)")
Cc: <stable@vger.kernel.org> # v4.4+
Signed-off-by: Andrei Botila <andrei.botila@nxp.com>
---
 drivers/crypto/caam/caamalg.c | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/drivers/crypto/caam/caamalg.c b/drivers/crypto/caam/caamalg.c
index ebf4dc87ca2e..a5447ae430b0 100644
--- a/drivers/crypto/caam/caamalg.c
+++ b/drivers/crypto/caam/caamalg.c
@@ -57,6 +57,7 @@
 #include "key_gen.h"
 #include "caamalg_desc.h"
 #include <crypto/engine.h>
+#include <crypto/xts.h>
 #include <asm/unaligned.h>
 
 /*
@@ -835,9 +836,10 @@ static int xts_skcipher_setkey(struct crypto_skcipher *skcipher, const u8 *key,
 	u32 *desc;
 	int err;
 
-	if (keylen != 2 * AES_MIN_KEY_SIZE  && keylen != 2 * AES_MAX_KEY_SIZE) {
+	err = xts_verify_key(skcipher, key, keylen);
+	if (err) {
 		dev_dbg(jrdev, "key size mismatch\n");
-		return -EINVAL;
+		return err;
 	}
 
 	err = crypto_skcipher_setkey(ctx->fallback, key, keylen);
@@ -1790,7 +1792,9 @@ static inline int skcipher_crypt(struct skcipher_request *req, bool encrypt)
 	if (!req->cryptlen)
 		return 0;
 
-	if (ctx->fallback && xts_skcipher_ivsize(req)) {
+	if (ctx->fallback && (xts_skcipher_ivsize(req) ||
+			      (ctx->cdata.keylen != 2 * AES_KEYSIZE_128 &&
+			       ctx->cdata.keylen != 2 * AES_KEYSIZE_256))) {
 		struct caam_skcipher_req_ctx *rctx = skcipher_request_ctx(req);
 
 		skcipher_request_set_tfm(&rctx->fallback_req, ctx->fallback);
-- 
2.17.1