]> git.proxmox.com Git - mirror_ubuntu-artful-kernel.git/commitdiff
crypto: hash - initialize entry len for null input in crypto hash sg list walk
authorTim Chen <tim.c.chen@linux.intel.com>
Thu, 10 Jul 2014 23:18:08 +0000 (16:18 -0700)
committerHerbert Xu <herbert@gondor.apana.org.au>
Mon, 25 Aug 2014 12:27:16 +0000 (20:27 +0800)
For the special case when we have a null input string, we want
to initialize the entry len to 0 for the hash/ahash walk, so
cyrpto_hash_walk_last will return the correct result indicating
that we have completed the scatter list walk.  Otherwise we may
keep walking the sg list and access bogus memory address.

Signed-off-by: Tim Chen <tim.c.chen@linux.intel.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
crypto/ahash.c

index f2a5d8f656ff44dea2c78aa1b31add76796cb3c5..f6a36a52d738b44251deaeaa2dd18ebee39da421 100644 (file)
@@ -131,8 +131,10 @@ int crypto_hash_walk_first(struct ahash_request *req,
 {
        walk->total = req->nbytes;
 
-       if (!walk->total)
+       if (!walk->total) {
+               walk->entrylen = 0;
                return 0;
+       }
 
        walk->alignmask = crypto_ahash_alignmask(crypto_ahash_reqtfm(req));
        walk->sg = req->src;
@@ -147,8 +149,10 @@ int crypto_ahash_walk_first(struct ahash_request *req,
 {
        walk->total = req->nbytes;
 
-       if (!walk->total)
+       if (!walk->total) {
+               walk->entrylen = 0;
                return 0;
+       }
 
        walk->alignmask = crypto_ahash_alignmask(crypto_ahash_reqtfm(req));
        walk->sg = req->src;
@@ -167,8 +171,10 @@ int crypto_hash_walk_first_compat(struct hash_desc *hdesc,
 {
        walk->total = len;
 
-       if (!walk->total)
+       if (!walk->total) {
+               walk->entrylen = 0;
                return 0;
+       }
 
        walk->alignmask = crypto_hash_alignmask(hdesc->tfm);
        walk->sg = sg;