From 73280f552fc82c3c9ac98199777c24815224bb74 Mon Sep 17 00:00:00 2001
From: Herbert Xu <herbert@gondor.apana.org.au>
Date: Mon, 27 Jun 2011 15:45:19 +0800
Subject: [PATCH] --- yaml --- r: 257935 b: refs/heads/master c:
 269230e7c52623cda279010c8032a6f5b59caaaf h: refs/heads/master i:   257933:
 9e1215c6cf89f24fb8d3d93f7b5ff0291ebcebc9   257931:
 f18e3285c9594e761a3e8e90922351a803b9cd5c   257927:
 04519cf6b1b39c5ae19f770a9a5a084b325acb62   257919:
 c7e77cf96312e9e57c781cb09ad6113cea4de5ab v: v3

---
 [refs]                    | 2 +-
 trunk/crypto/algif_hash.c | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 04f13f8757dd..1e4abad6a100 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 36ca239b245dbdec3b0c94976e956226bdd4108c
+refs/heads/master: 269230e7c52623cda279010c8032a6f5b59caaaf
diff --git a/trunk/crypto/algif_hash.c b/trunk/crypto/algif_hash.c
index 62122a1a2f7a..ef5356cd280a 100644
--- a/trunk/crypto/algif_hash.c
+++ b/trunk/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);