crypto: algif - return error code when no data was processed

If no data has been processed during recvmsg, return the error code.
This covers all errors received during non-AIO operations.

If any error occurs during a synchronous operation in addition to
-EIOCBQUEUED or -EBADMSG (like -ENOMEM), it should be relayed to the
caller.

Signed-off-by: Stephan Mueller <smueller@chronox.de>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>

1 files changed, 3 insertions, 1 deletions

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;
                 }