git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-3.1/drivers' of git://git.kernel.dk/linux-block
[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);