p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

crypto: hash - initialize entry len for null input in crypto hash sg list walk 

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>
This commit is contained in:
Tim Chen 2014-07-10 16:18:08 -07:00 committed by Herbert Xu
parent 7d1311b93e
commit 6d9529c586
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
crypto/ahash.c
View File

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