From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Fri, 1 May 2026 08:55:06 +0000 (+0200)
Subject: 6.12-stable patches
X-Git-Tag: v6.12.86~81
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b566ce9de96161198924d773d0cf2f4eb48bd62c;p=thirdparty%2Fkernel%2Fstable-queue.git

6.12-stable patches

added patches:
	crypto-pcrypt-fix-handling-of-may_backlog-requests.patch
---

diff --git a/queue-6.12/crypto-pcrypt-fix-handling-of-may_backlog-requests.patch b/queue-6.12/crypto-pcrypt-fix-handling-of-may_backlog-requests.patch
new file mode 100644
index 0000000000..0042a993c8
--- /dev/null
+++ b/queue-6.12/crypto-pcrypt-fix-handling-of-may_backlog-requests.patch
@@ -0,0 +1,51 @@
+From 915b692e6cb723aac658c25eb82c58fd81235110 Mon Sep 17 00:00:00 2001
+From: Herbert Xu <herbert@gondor.apana.org.au>
+Date: Thu, 16 Apr 2026 17:00:50 +0800
+Subject: crypto: pcrypt - Fix handling of MAY_BACKLOG requests
+
+From: Herbert Xu <herbert@gondor.apana.org.au>
+
+commit 915b692e6cb723aac658c25eb82c58fd81235110 upstream.
+
+MAY_BACKLOG requests can return EBUSY.  Handle them by checking
+for that value and filtering out EINPROGRESS notifications.
+
+Reported-by: Yiming Qian <yimingqian591@gmail.com>
+Fixes: 5a1436beec57 ("crypto: pcrypt - call the complete function on error")
+Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
+Cc: Eric Biggers <ebiggers@kernel.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ crypto/pcrypt.c |    7 +++++--
+ 1 file changed, 5 insertions(+), 2 deletions(-)
+
+--- a/crypto/pcrypt.c
++++ b/crypto/pcrypt.c
+@@ -69,6 +69,9 @@ static void pcrypt_aead_done(void *data,
+ 	struct pcrypt_request *preq = aead_request_ctx(req);
+ 	struct padata_priv *padata = pcrypt_request_padata(preq);
+ 
++	if (err == -EINPROGRESS)
++		return;
++
+ 	padata->info = err;
+ 
+ 	padata_do_serial(padata);
+@@ -82,7 +85,7 @@ static void pcrypt_aead_enc(struct padat
+ 
+ 	ret = crypto_aead_encrypt(req);
+ 
+-	if (ret == -EINPROGRESS)
++	if (ret == -EINPROGRESS || ret == -EBUSY)
+ 		return;
+ 
+ 	padata->info = ret;
+@@ -133,7 +136,7 @@ static void pcrypt_aead_dec(struct padat
+ 
+ 	ret = crypto_aead_decrypt(req);
+ 
+-	if (ret == -EINPROGRESS)
++	if (ret == -EINPROGRESS || ret == -EBUSY)
+ 		return;
+ 
+ 	padata->info = ret;
diff --git a/queue-6.12/series b/queue-6.12/series
index 142e730889..d5a41ac17b 100644
--- a/queue-6.12/series
+++ b/queue-6.12/series
@@ -33,3 +33,4 @@ um-drivers-call-kernel_strrchr-explicitly-in-cow_user.c.patch
 spi-imx-fix-use-after-free-on-unbind.patch
 spi-ch341-fix-memory-leaks-on-probe-failures.patch
 mm-memory_hotplug-fix-hwpoisoned-large-folio-handlin.patch
+crypto-pcrypt-fix-handling-of-may_backlog-requests.patch