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 'x86/cleanups' into x86/trampoline
[pandora-kernel.git]
/
crypto
/
ahash.c
diff --git
a/crypto/ahash.c
b/crypto/ahash.c
index
b8c59b8
..
f669822
100644
(file)
--- a/
crypto/ahash.c
+++ b/
crypto/ahash.c
@@
-47,8
+47,11
@@
static int hash_walk_next(struct crypto_hash_walk *walk)
walk->data = crypto_kmap(walk->pg, 0);
walk->data += offset;
walk->data = crypto_kmap(walk->pg, 0);
walk->data += offset;
- if (offset & alignmask)
- nbytes = alignmask + 1 - (offset & alignmask);
+ if (offset & alignmask) {
+ unsigned int unaligned = alignmask + 1 - (offset & alignmask);
+ if (nbytes > unaligned)
+ nbytes = unaligned;
+ }
walk->entrylen -= nbytes;
return nbytes;
walk->entrylen -= nbytes;
return nbytes;