diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-03 12:45:53 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-03 12:45:53 -0400 |
| commit | c54c4dec61eec88de8260a00260fe89aa538f267 (patch) | |
| tree | b515c760f6eba432f05625b417612550c755efe5 /crypto/shash.c | |
| parent | 5de1ccbe51e89c51a2fe5ab333b7c9c2e7294aff (diff) | |
| parent | 0d44dc59b2b434b29aafeae581d06f81efac7c83 (diff) | |
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/shash.c')
| -rw-r--r-- | crypto/shash.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/crypto/shash.c b/crypto/shash.c index 7a659733f94a..2ccc8b0076ce 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, | |||
| 77 | u8 buf[shash_align_buffer_size(unaligned_len, alignmask)] | 77 | u8 buf[shash_align_buffer_size(unaligned_len, alignmask)] |
| 78 | __attribute__ ((aligned)); | 78 | __attribute__ ((aligned)); |
| 79 | 79 | ||
| 80 | if (unaligned_len > len) | ||
| 81 | unaligned_len = len; | ||
| 82 | |||
| 80 | memcpy(buf, data, unaligned_len); | 83 | memcpy(buf, data, unaligned_len); |
| 81 | 84 | ||
| 82 | return shash->update(desc, buf, unaligned_len) ?: | 85 | return shash->update(desc, buf, unaligned_len) ?: |