summaryrefslogtreecommitdiffstats
path: root/crypto
diff options
context:
space:
mode:
authorHerbert Xu <herbert@gondor.apana.org.au>2020-07-31 17:03:27 +1000
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2020-10-29 09:07:01 +0100
commit9751cc18971d1c3e1103a823b5324cb8312058a4 (patch)
treefac683d78f97ad7bd8d40b5f7d500a7d523129f4 /crypto
parent4495d432d3bf58ecefa4ad60536d0bfc9d1a7400 (diff)
downloadlinux-stable-9751cc18971d1c3e1103a823b5324cb8312058a4.tar.gz
linux-stable-9751cc18971d1c3e1103a823b5324cb8312058a4.tar.bz2
linux-stable-9751cc18971d1c3e1103a823b5324cb8312058a4.zip
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>
Diffstat (limited to 'crypto')
-rw-r--r--crypto/algif_skcipher.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/crypto/algif_skcipher.c b/crypto/algif_skcipher.c
index d9ec5dca8672..a9dc4eeddcd5 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);