diff mbox series

crypto: skcipher - fix mismatch between mapping and unmapping order

Message ID 20250306033305.163767-1-ebiggers@kernel.org
State New
Headers show
Series crypto: skcipher - fix mismatch between mapping and unmapping order | expand

Commit Message

Eric Biggers March 6, 2025, 3:33 a.m. UTC 
From: Eric Biggers <ebiggers@google.com>

Local kunmaps have to be unmapped in the opposite order from which they
were mapped.  My recent change flipped the unmap order in the
SKCIPHER_WALK_DIFF case.  Adjust the mapping side to match.

This fixes a WARN_ON_ONCE that was triggered when running the
crypto-self tests on a 32-bit kernel with
CONFIG_DEBUG_KMAP_LOCAL_FORCE_MAP=y.

Fixes: 95dbd711b1d8 ("crypto: skcipher - use the new scatterwalk functions")
Signed-off-by: Eric Biggers <ebiggers@google.com>
---
 crypto/skcipher.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)


base-commit: 17ec3e71ba797cdb62164fea9532c81b60f47167

Comments

Herbert Xu March 8, 2025, 8:33 a.m. UTC | #1 
Eric Biggers <ebiggers@kernel.org> wrote:
> From: Eric Biggers <ebiggers@google.com>
> 
> Local kunmaps have to be unmapped in the opposite order from which they
> were mapped.  My recent change flipped the unmap order in the
> SKCIPHER_WALK_DIFF case.  Adjust the mapping side to match.
> 
> This fixes a WARN_ON_ONCE that was triggered when running the
> crypto-self tests on a 32-bit kernel with
> CONFIG_DEBUG_KMAP_LOCAL_FORCE_MAP=y.
> 
> Fixes: 95dbd711b1d8 ("crypto: skcipher - use the new scatterwalk functions")
> Signed-off-by: Eric Biggers <ebiggers@google.com>
> ---
> crypto/skcipher.c | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)

Patch applied.  Thanks.
diff mbox series

Patch

diff --git a/crypto/skcipher.c b/crypto/skcipher.c
index 53123d3685d5d..66d19c360dd8b 100644
--- a/crypto/skcipher.c
+++ b/crypto/skcipher.c
@@ -207,16 +207,16 @@  static int skcipher_next_fast(struct skcipher_walk *walk)
 	diff = offset_in_page(walk->in.offset) -
 	       offset_in_page(walk->out.offset);
 	diff |= (u8 *)(sg_page(walk->in.sg) + (walk->in.offset >> PAGE_SHIFT)) -
 		(u8 *)(sg_page(walk->out.sg) + (walk->out.offset >> PAGE_SHIFT));
 
-	skcipher_map_src(walk);
-	walk->dst.virt.addr = walk->src.virt.addr;
+	skcipher_map_dst(walk);
+	walk->src.virt.addr = walk->dst.virt.addr;
 
 	if (diff) {
 		walk->flags |= SKCIPHER_WALK_DIFF;
-		skcipher_map_dst(walk);
+		skcipher_map_src(walk);
 	}
 
 	return 0;
 }