2010-11-28 08:29:38

by Herbert Xu

[permalink] [raw]
Subject: crypto: algif_skcipher - Pass on error from af_alg_make_sg


The error from af_alg_make_sg was lost unintentionally.

commit c762be637503b833012457087133c1292fd6056d
Author: Herbert Xu <[email protected]>
Date: Sun Nov 28 16:28:01 2010 +0800

crypto: algif_skcipher - Pass on error from af_alg_make_sg

The error returned from af_alg_make_sg is currently lost and we
always pass on -EINVAL. This patch pases on the underlying error.

Signed-off-by: Herbert Xu <[email protected]>

diff --git a/crypto/algif_skcipher.c b/crypto/algif_skcipher.c
index 211c956..9b2f440 100644
--- a/crypto/algif_skcipher.c
+++ b/crypto/algif_skcipher.c
@@ -472,7 +472,8 @@ static int skcipher_recvmsg(struct kiocb *unused, struct socket *sock,
goto unlock;

used = af_alg_make_sg(&ctx->rsgl, from, used, 1);
- if (used < 0)
+ err = used;
+ if (err < 0)
goto unlock;

ablkcipher_request_set_crypt(&ctx->req, sg,

Email: Herbert Xu <[email protected]>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt