From: Herbert Xu <herbert@gondor.apana.org.au>
Date: Fri, 31 Jul 2020 07:03:27 +0000 (+1000)
Subject: crypto: algif_skcipher - EBUSY on aio should be an error
X-Git-Tag: v4.14.203~168
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=9751cc18971d1c3e1103a823b5324cb8312058a4;p=users%2Fdwmw2%2Flinux.git

crypto: algif_skcipher - EBUSY on aio should be an error

[ Upstream commit 2a05b029c1ee045b886ebf9efef9985ca23450de ]

I removed the MAY_BACKLOG flag on the aio path a while ago but
the error check still incorrectly interpreted EBUSY as success.
This may cause the submitter to wait for a request that will never
complete.

Fixes: dad419970637 ("crypto: algif_skcipher - Do not set...")
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---

diff --git a/crypto/algif_skcipher.c b/crypto/algif_skcipher.c
index d9ec5dca86729..a9dc4eeddcd53 100644
--- a/crypto/algif_skcipher.c
+++ b/crypto/algif_skcipher.c
@@ -133,7 +133,7 @@ static int _skcipher_recvmsg(struct socket *sock, struct msghdr *msg,
 			crypto_skcipher_decrypt(&areq->cra_u.skcipher_req);
 
 		/* AIO operation in progress */
-		if (err == -EINPROGRESS || err == -EBUSY)
+		if (err == -EINPROGRESS)
 			return -EIOCBQUEUED;
 
 		sock_put(sk);