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:55:01 +0100
commitb0112ecef7d8e65b71ee9e30d9635788ddcbb48b (patch)
treed9022373c903023b14252f75d87cca8e18c520d8 /crypto
parente78c9feafb9e4399fc31d11df862afd6a7de5bfa (diff)
downloadlinux-stable-b0112ecef7d8e65b71ee9e30d9635788ddcbb48b.tar.gz
linux-stable-b0112ecef7d8e65b71ee9e30d9635788ddcbb48b.tar.bz2
linux-stable-b0112ecef7d8e65b71ee9e30d9635788ddcbb48b.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 1cb106c46043..9d2e9783c0d4 100644
--- a/crypto/algif_skcipher.c
+++ b/crypto/algif_skcipher.c
@@ -127,7 +127,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);