[PATCH] Crypto: Don't use err uninitialized inalgif_hash.c:hash_sendmsg()

From: Jesper Juhl
Date: Sun Jun 26 2011 - 17:37:07 EST


If af_alg_make_sg() returns <0 in hash_sendmsg() we'll jump to the
'unlock' label without having set 'err' to anything. At the 'unlock'
label the value of 'err' is tested to determine return value of the
function - not good to base that on a uninitialized variable.

This patch sets 'err' to the return value of hash_sendmsg() before the
'goto' when the value is less than zero, which seems to me to be the
proper thing to do.

Signed-off-by: Jesper Juhl <jj@xxxxxxxxxxxxx>
---
crypto/algif_hash.c | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/crypto/algif_hash.c b/crypto/algif_hash.c
index 62122a1..1847544 100644
--- a/crypto/algif_hash.c
+++ b/crypto/algif_hash.c
@@ -68,9 +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 = newlen;
goto unlock;
-
+ }
ahash_request_set_crypt(&ctx->req, ctx->sgl.sg, NULL,
newlen);

--
1.7.5.2


--
Jesper Juhl <jj@xxxxxxxxxxxxx> http://www.chaosbits.net/
Don't top-post http://www.catb.org/jargon/html/T/top-post.html
Plain text mails only, please.

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/