Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5703c826 authored Jul 30, 2017 by Stephan Mueller Committed by Herbert Xu Aug 09, 2017

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>

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