summaryrefslogtreecommitdiffstats
path: root/crypto
diff options
context:
space:
mode:
authorHerbert Xu <herbert@gondor.apana.org.au>2011-06-27 15:45:19 +0800
committerHerbert Xu <herbert@gondor.apana.org.au>2011-06-30 07:44:06 +0800
commit269230e7c52623cda279010c8032a6f5b59caaaf (patch)
tree4acb3b9d9e4b1f7b3151d8e91e3201524140893a /crypto
parent36ca239b245dbdec3b0c94976e956226bdd4108c (diff)
downloadlinux-stable-269230e7c52623cda279010c8032a6f5b59caaaf.tar.gz
linux-stable-269230e7c52623cda279010c8032a6f5b59caaaf.tar.bz2
linux-stable-269230e7c52623cda279010c8032a6f5b59caaaf.zip
crypto: algif_hash - Handle initial af_alg_make_sg error correctly
When the first call to af_alg_make_sg fails, we may return garbage instead of the real error. This patch fixes it by setting the error if "copied" is zero. Based on a patch by Jesper Juhl. Reported-by: Jesper Juhl <jj@chaosbits.net> Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Diffstat (limited to 'crypto')
-rw-r--r--crypto/algif_hash.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/crypto/algif_hash.c b/crypto/algif_hash.c
index 62122a1a2f7a..ef5356cd280a 100644
--- a/crypto/algif_hash.c
+++ b/crypto/algif_hash.c
@@ -68,8 +68,10 @@ static int hash_sendmsg(struct kiocb *unused, struct socket *sock,
int newlen;
newlen = af_alg_make_sg(&ctx->sgl, from, len, 0);
- if (newlen < 0)
+ if (newlen < 0) {
+ err = copied ? 0 : newlen;
goto unlock;
+ }
ahash_request_set_crypt(&ctx->req, ctx->sgl.sg, NULL,
newlen);