[PATCH v6 0/2] crypto: caam - Fix RSA error-path unmap and unaligned dst buffers

From: Changwei Zou

Date: Sat Nov 14 2026 - 01:01:40 EST


This series fixes two issues in the rsa-caam driver.

Patch 1 fixes wrong unmap operations where rsa_pub_unmap() was called
regardless of the key type.

Patch 2 adds a bounce buffer to handle unaligned RSA destination
buffers on DMA-incoherent hardware such as i.MX8, fixing intermittent
-EKEYREJECTED errors when loading signed kernel modules.

Changes in v6:
- Patch 1: Factor the priv_form switch into rsa_priv_unmap(), shared by
rsa_priv_f_done() and rsa_pdb_unmap(), removing the duplicated switch.
- Patch 2: Hoist req_ctx to function scope in set_rsa_priv_f{1,2,3}_pdb(),
removing the duplicate block-local declarations in the src/dst branches.

Changes in v5:
- Patch 1: Factor the public/FORM1/FORM2/FORM3 error-path unmap dispatch
into rsa_pdb_unmap(), so akcipher_do_one_req() and akcipher_enqueue_req()
no longer open-code it twice (Sahil).
- Patch 2: Do not overwrite the caller's req->dst. Use req_ctx->fixup_dst
for the DMA side (mirroring fixup_src) and drop the orig_dst/restore
logic (Sahil). Expand the commit message to identify the caller that
hands in the misaligned dst (rsassa_pkcs1_verify() /
crypto_akcipher_sync_prep()) and why the DMA API does not bounce it.

Changes in v4:
- Patch 2: Describe the bounce scatterlist with the aligned allocation
size (ALIGN(dst_len, dma_get_cache_alignment())) instead of the
possibly-unaligned dst_len. Otherwise, on
CONFIG_DMA_BOUNCE_UNALIGNED_KMALLOC systems, dma_map_sg() evaluates
sg->length and can treat the already aligned bounce buffer as
unaligned, bouncing it again via swiotlb or failing with -ENOMEM.

Changes in v3:
- Patch 1: Dispatch the error-path unmap on the operation (the completion
callback rsa_pub_done vs rsa_priv_f_done) instead of key->d, so the
unmap always matches the map.
- Patch 2: Bound the bounce-buffer copy-back to the RSA output size
(key->n_sz) instead of the full dst_len, so the trailing capacity of
the caller's destination buffer is left untouched; add Tested-by from
Stephane Debusne.

Changes in v2:
- Patch 1: Add Fixes: tag; pick up Reviewed-by from Sahil Malhotra.
- Patch 2: Move the !bounce_buf check out of do_rsa_bounce_buf() into
the caller rsa_bounce_buf_done() so the helper is only entered when a
bounce buffer actually exists; add Reported-by/Closes and Tested-by
from Martin Kepplinger-Novakovic.

Link to v5:
https://lore.kernel.org/linux-crypto/20261113113650.63038-1-changwei.zou@xxxxxxxxxxxxx/

Link to v4:
https://lore.kernel.org/linux-crypto/20261111230221.40297-1-changwei.zou@xxxxxxxxxxxxx/

Link to v3:
https://lore.kernel.org/linux-crypto/20261020025426.955531-1-changwei.zou@xxxxxxxxxxxxx/

Link to v2:
https://lore.kernel.org/linux-crypto/20261004210200.290119-1-changwei.zou@xxxxxxxxxxxxx/

Link to v1:
https://lore.kernel.org/linux-crypto/20260821045555.806471-1-changwei.zou@xxxxxxxxxxxxx/

Changwei Zou (2):
crypto: caam - Fix wrong unmap operations
crypto: caam - Use bounce buffer for unaligned RSA destination buffers

drivers/crypto/caam/caampkc.c | 177 ++++++++++++++++++++++++++--------
drivers/crypto/caam/caampkc.h | 7 ++
2 files changed, 142 insertions(+), 42 deletions(-)

--
2.43.0