Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzi...

[pandora-kernel.git] / crypto / algif_hash.c

diff --git a/crypto/algif_hash.c b/crypto/algif_hash.c
index 62122a1..ef5356c 100644 (file)
--- 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);