From: T Pratham <t-pratham@ti.com>
To: T Pratham <t-pratham@ti.com>,
Herbert Xu <herbert@gondor.apana.org.au>,
"David S. Miller" <davem@davemloft.net>
Cc: Sebin Francis <sebin.francis@ti.com>,
Manorit Chawdhry <m-chawdhry@ti.com>,
Vishal Mahaveer <vishalm@ti.com>,
Praneeth Bajjuri <praneeth@ti.com>,
<linux-crypto@vger.kernel.org>, <linux-kernel@vger.kernel.org>
Subject: [PATCH v3 07/12] crypto: ti - Separate padding buffer for src and dst
Date: Thu, 10 Sep 2026 16:11:57 +0530 [thread overview]
Message-ID: <20260910104202.1537226-8-t-pratham@ti.com> (raw)
In-Reply-To: <20260910104202.1537226-1-t-pratham@ti.com>
Separate the padding buffer, which is allocated in the req ctx, for src
and dst scatterlist to avoid any DMA mapping issues when not doing
inline operations. In such cases, the current code was mapping the same
padding buffer twice which might cause issues.
Fixes: 35645ca63caa1 ("crypto: ti - Add support for AES-CTR in DTHEv2 driver")
Signed-off-by: T Pratham <t-pratham@ti.com>
---
drivers/crypto/ti/dthev2-aes.c | 19 ++++++++++++-------
drivers/crypto/ti/dthev2-common.h | 2 +-
2 files changed, 13 insertions(+), 8 deletions(-)
diff --git a/drivers/crypto/ti/dthev2-aes.c b/drivers/crypto/ti/dthev2-aes.c
index be7ec62ab2513..aeccc235cb667 100644
--- a/drivers/crypto/ti/dthev2-aes.c
+++ b/drivers/crypto/ti/dthev2-aes.c
@@ -338,6 +338,9 @@ static int dthe_aes_run(struct crypto_engine *engine, void *areq)
int src_mapped_nents;
int dst_mapped_nents;
+ u8 *src_padding = rctx->padding;
+ u8 *dst_padding = rctx->padding + AES_BLOCK_SIZE;
+
bool diff_dst;
enum dma_data_direction src_dir, dst_dir;
@@ -388,8 +391,8 @@ static int dthe_aes_run(struct crypto_engine *engine, void *areq)
sg_init_table(src, src_nents);
sg = dthe_copy_sg(src, req->src, req->cryptlen);
if (pad_len > 0) {
- memzero_explicit(rctx->padding, AES_BLOCK_SIZE);
- sg_set_buf(sg, rctx->padding, pad_len);
+ memzero_explicit(src_padding, AES_BLOCK_SIZE);
+ sg_set_buf(sg, src_padding, pad_len);
}
if (diff_dst) {
@@ -401,8 +404,10 @@ static int dthe_aes_run(struct crypto_engine *engine, void *areq)
sg_init_table(dst, dst_nents);
sg = dthe_copy_sg(dst, req->dst, req->cryptlen);
- if (pad_len > 0)
- sg_set_buf(sg, rctx->padding, pad_len);
+ if (pad_len > 0) {
+ memzero_explicit(dst_padding, AES_BLOCK_SIZE);
+ sg_set_buf(sg, dst_padding, pad_len);
+ }
} else {
dst = src;
}
@@ -492,7 +497,7 @@ static int dthe_aes_run(struct crypto_engine *engine, void *areq)
aes_map_src_err:
if (ctx->aes_mode == DTHE_AES_CTR && req->cryptlen % AES_BLOCK_SIZE)
- memzero_explicit(rctx->padding, AES_BLOCK_SIZE);
+ memzero_explicit(rctx->padding, 2 * AES_BLOCK_SIZE);
if (diff_dst)
kfree(dst);
@@ -882,7 +887,7 @@ static int dthe_aead_run(struct crypto_engine *engine, void *areq)
u8 *src_assoc_padbuf = rctx->padding;
u8 *src_crypt_padbuf = rctx->padding + AES_BLOCK_SIZE;
- u8 *dst_crypt_padbuf = rctx->padding + AES_BLOCK_SIZE;
+ u8 *dst_crypt_padbuf = rctx->padding + 2 * AES_BLOCK_SIZE;
bool diff_dst;
enum dma_data_direction aad_dir, src_dir, dst_dir;
@@ -1125,7 +1130,7 @@ static int dthe_aead_run(struct crypto_engine *engine, void *areq)
kfree(aad_sg);
aead_prep_aad_err:
- memzero_explicit(rctx->padding, 2 * AES_BLOCK_SIZE);
+ memzero_explicit(rctx->padding, 3 * AES_BLOCK_SIZE);
if (ret)
ret = dthe_aead_do_fallback(req);
diff --git a/drivers/crypto/ti/dthev2-common.h b/drivers/crypto/ti/dthev2-common.h
index cfb50255a5dce..f78420ba871e2 100644
--- a/drivers/crypto/ti/dthev2-common.h
+++ b/drivers/crypto/ti/dthev2-common.h
@@ -115,7 +115,7 @@ struct dthe_tfm_ctx {
struct dthe_aes_req_ctx {
int enc;
__dma_from_device_group_begin();
- u8 padding[2 * AES_BLOCK_SIZE];
+ u8 padding[3 * AES_BLOCK_SIZE];
__dma_from_device_group_end();
struct completion aes_compl;
struct dthe_data *dev_data;
--
2.34.1
next prev parent reply other threads:[~2026-09-10 10:43 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-09-10 10:41 [PATCH v3 00/12] Fix several issues in DTHEv2 driver T Pratham
2026-09-10 10:41 ` [PATCH v3 01/12] crypto: ti - Use list_first_entry_or_null() in dthe_get_dev() T Pratham
2026-09-10 10:41 ` [PATCH v3 02/12] crypto: ti - Fix spinlock inconsistency in DTHEv2 T Pratham
2026-09-10 10:41 ` [PATCH v3 03/12] crypto: ti - Fix potential memory corruption on highmem pages T Pratham
2026-09-10 10:41 ` [PATCH v3 04/12] crypto: ti - Fix use-after-free of dev_data on DTHEv2 driver removal T Pratham
2026-09-10 10:41 ` [PATCH v3 05/12] crypto: ti - Trim scatterlists to correct length in AES T Pratham
2026-09-10 10:41 ` [PATCH v3 06/12] crypto: ti - Align buffers to cacheline for DMA T Pratham
2026-09-10 10:41 ` T Pratham [this message]
2026-09-10 10:41 ` [PATCH v3 08/12] crypto: ti - Validate sg_nents_for_len() return value in DTHEv2 AES T Pratham
2026-09-10 10:41 ` [PATCH v3 09/12] crypto: ti - Validate sg_nents_for_len() return value in DTHEv2 AEAD T Pratham
2026-09-10 10:42 ` [PATCH v3 10/12] crypto: ti - Terminate DMA on all error paths in AES to clear descriptors T Pratham
2026-09-10 10:42 ` [PATCH v3 11/12] crypto: ti - Terminate DMA on all error paths in AEAD " T Pratham
2026-09-10 10:42 ` [PATCH v3 12/12] crypto: ti - Do AEAD software fallback on only ENOMEM T Pratham
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20260910104202.1537226-8-t-pratham@ti.com \
--to=t-pratham@ti.com \
--cc=davem@davemloft.net \
--cc=herbert@gondor.apana.org.au \
--cc=linux-crypto@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=m-chawdhry@ti.com \
--cc=praneeth@ti.com \
--cc=sebin.francis@ti.com \
--cc=vishalm@ti.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox