You cannot select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
60 lines
2.1 KiB
Diff
60 lines
2.1 KiB
Diff
From 7f19380b2cfd412dcef2facefb3f6c62788864d7 Mon Sep 17 00:00:00 2001
|
|
From: Eneas U de Queiroz <cotequeiroz@gmail.com>
|
|
Date: Fri, 7 Feb 2020 12:02:27 -0300
|
|
Subject: [PATCH 11/11] crypto: qce - handle AES-XTS cases that qce fails
|
|
|
|
QCE hangs when presented with an AES-XTS request whose length is larger
|
|
than QCE_SECTOR_SIZE (512-bytes), and is not a multiple of it. Let the
|
|
fallback cipher handle them.
|
|
|
|
Signed-off-by: Eneas U de Queiroz <cotequeiroz@gmail.com>
|
|
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
|
|
---
|
|
drivers/crypto/qce/common.c | 2 --
|
|
drivers/crypto/qce/common.h | 3 +++
|
|
drivers/crypto/qce/skcipher.c | 9 +++++++--
|
|
3 files changed, 10 insertions(+), 4 deletions(-)
|
|
|
|
--- a/drivers/crypto/qce/common.c
|
|
+++ b/drivers/crypto/qce/common.c
|
|
@@ -15,8 +15,6 @@
|
|
#include "regs-v5.h"
|
|
#include "sha.h"
|
|
|
|
-#define QCE_SECTOR_SIZE 512
|
|
-
|
|
static inline u32 qce_read(struct qce_device *qce, u32 offset)
|
|
{
|
|
return readl(qce->base + offset);
|
|
--- a/drivers/crypto/qce/common.h
|
|
+++ b/drivers/crypto/qce/common.h
|
|
@@ -12,6 +12,9 @@
|
|
#include <crypto/hash.h>
|
|
#include <crypto/internal/skcipher.h>
|
|
|
|
+/* xts du size */
|
|
+#define QCE_SECTOR_SIZE 512
|
|
+
|
|
/* key size in bytes */
|
|
#define QCE_SHA_HMAC_KEY_SIZE 64
|
|
#define QCE_MAX_CIPHER_KEY_SIZE AES_KEYSIZE_256
|
|
--- a/drivers/crypto/qce/skcipher.c
|
|
+++ b/drivers/crypto/qce/skcipher.c
|
|
@@ -227,9 +227,14 @@ static int qce_skcipher_crypt(struct skc
|
|
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
|
|
+ */
|
|
if (IS_AES(rctx->flags) &&
|
|
- ((keylen != AES_KEYSIZE_128 && keylen != AES_KEYSIZE_256) ||
|
|
- req->cryptlen <= aes_sw_max_len)) {
|
|
+ (((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))) {
|
|
SYNC_SKCIPHER_REQUEST_ON_STACK(subreq, ctx->fallback);
|
|
|
|
skcipher_request_set_sync_tfm(subreq, ctx->fallback);
|