summaryrefslogtreecommitdiff
path: root/crypto
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-04-03 09:45:53 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2009-04-03 09:45:53 -0700
commitc54c4dec61eec88de8260a00260fe89aa538f267 (patch)
treeb515c760f6eba432f05625b417612550c755efe5 /crypto
parent5de1ccbe51e89c51a2fe5ab333b7c9c2e7294aff (diff)
parent0d44dc59b2b434b29aafeae581d06f81efac7c83 (diff)
downloadlinux-3.10-c54c4dec61eec88de8260a00260fe89aa538f267.tar.gz
linux-3.10-c54c4dec61eec88de8260a00260fe89aa538f267.tar.bz2
linux-3.10-c54c4dec61eec88de8260a00260fe89aa538f267.zip
Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6: crypto: ixp4xx - Fix handling of chained sg buffers crypto: shash - Fix unaligned calculation with short length hwrng: timeriomem - Use phys address rather than virt
Diffstat (limited to 'crypto')
-rw-r--r--crypto/shash.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/crypto/shash.c b/crypto/shash.c
index 7a659733f94..2ccc8b0076c 100644
--- a/crypto/shash.c
+++ b/crypto/shash.c
@@ -77,6 +77,9 @@ static int shash_update_unaligned(struct shash_desc *desc, const u8 *data,
u8 buf[shash_align_buffer_size(unaligned_len, alignmask)]
__attribute__ ((aligned));
+ if (unaligned_len > len)
+ unaligned_len = len;
+
memcpy(buf, data, unaligned_len);
return shash->update(desc, buf, unaligned_len) ?: