summaryrefslogtreecommitdiff
path: root/crypto
diff options
context:
space:
mode:
Diffstat (limited to 'crypto')
-rw-r--r--crypto/algif_aead.c4
-rw-r--r--crypto/algif_skcipher.c4
2 files changed, 6 insertions, 2 deletions
diff --git a/crypto/algif_aead.c b/crypto/algif_aead.c
index 9755aac0fe26..2de056c3139c 100644
--- a/crypto/algif_aead.c
+++ b/crypto/algif_aead.c
@@ -791,9 +791,11 @@ static int aead_recvmsg(struct socket *sock, struct msghdr *msg,
* only handle one AIO request. If the caller wants to have
* multiple AIO requests in parallel, he must make multiple
* separate AIO calls.
+ *
+ * Also return the error if no data has been processed so far.
*/
if (err <= 0) {
- if (err == -EIOCBQUEUED || err == -EBADMSG)
+ if (err == -EIOCBQUEUED || err == -EBADMSG || !ret)
ret = err;
goto out;
}
diff --git a/crypto/algif_skcipher.c b/crypto/algif_skcipher.c
index 968d094f0bcc..ce3b5fba2279 100644
--- a/crypto/algif_skcipher.c
+++ b/crypto/algif_skcipher.c
@@ -714,9 +714,11 @@ static int skcipher_recvmsg(struct socket *sock, struct msghdr *msg,
* only handle one AIO request. If the caller wants to have
* multiple AIO requests in parallel, he must make multiple
* separate AIO calls.
+ *
+ * Also return the error if no data has been processed so far.
*/
if (err <= 0) {
- if (err == -EIOCBQUEUED)
+ if (err == -EIOCBQUEUED || !ret)
ret = err;
goto out;
}