From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Thu, 23 Apr 2026 04:57:50 +0000 (+0200)
Subject: 6.18-stable patches
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=a4044b58075e5cfbf9bbd9063f370cf2e2a29fa4;p=thirdparty%2Fkernel%2Fstable-queue.git

6.18-stable patches

added patches:
	crypto-authencesn-fix-src-offset-when-decrypting-in-place.patch
---

diff --git a/queue-6.18/crypto-authencesn-fix-src-offset-when-decrypting-in-place.patch b/queue-6.18/crypto-authencesn-fix-src-offset-when-decrypting-in-place.patch
new file mode 100644
index 0000000000..366d89eb16
--- /dev/null
+++ b/queue-6.18/crypto-authencesn-fix-src-offset-when-decrypting-in-place.patch
@@ -0,0 +1,36 @@
+From 1f48ad3b19a9dfc947868edda0bb8e48e5b5a8fa Mon Sep 17 00:00:00 2001
+From: Herbert Xu <herbert@gondor.apana.org.au>
+Date: Wed, 15 Apr 2026 07:39:06 +0800
+Subject: crypto: authencesn - Fix src offset when decrypting in-place
+
+From: Herbert Xu <herbert@gondor.apana.org.au>
+
+commit 1f48ad3b19a9dfc947868edda0bb8e48e5b5a8fa upstream.
+
+The src SG list offset wasn't set properly when decrypting in-place,
+fix it.
+
+Reported-by: Wolfgang Walter <linux@stwm.de>
+Fixes: e02494114ebf ("crypto: authencesn - Do not place hiseq at end of dst for out-of-place decryption")
+Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ crypto/authencesn.c |    6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+--- a/crypto/authencesn.c
++++ b/crypto/authencesn.c
+@@ -228,9 +228,11 @@ static int crypto_authenc_esn_decrypt_ta
+ 
+ decrypt:
+ 
+-	if (src != dst)
+-		src = scatterwalk_ffwd(areq_ctx->src, src, assoclen);
+ 	dst = scatterwalk_ffwd(areq_ctx->dst, dst, assoclen);
++	if (req->src == req->dst)
++		src = dst;
++	else
++		src = scatterwalk_ffwd(areq_ctx->src, src, assoclen);
+ 
+ 	skcipher_request_set_tfm(skreq, ctx->enc);
+ 	skcipher_request_set_callback(skreq, flags,
diff --git a/queue-6.18/series b/queue-6.18/series
index 6a67dad2e3..2e775f07b1 100644
--- a/queue-6.18/series
+++ b/queue-6.18/series
@@ -1,3 +1,4 @@
+crypto-authencesn-fix-src-offset-when-decrypting-in-place.patch
 arm64-tlb-allow-xzr-argument-to-tlbi-ops.patch
 arm64-tlb-optimize-arm64_workaround_repeat_tlbi.patch
 arm64-tlb-introduce-__tlbi_sync_s1ish_-kernel-batch-.patch