Commit 5703c826 authored by Stephan Mueller's avatar Stephan Mueller Committed by Herbert Xu
Browse files

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: default avatarStephan Mueller <smueller@chronox.de>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent 5060ffc9

crypto/algif_aead.c

+3 −1
Original line number Diff line number Diff line
@@ -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;

		}

crypto/algif_skcipher.c

+3 −1
Original line number Diff line number Diff line
@@ -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;

		}

CRA Git | Maintained and supported by SUSTech CRA and CCSE