diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-03 09:45:53 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-03 09:45:53 -0700 |
| commit | c5bc839de2485ae70d7f60a07d22da6183685e8d (patch) | |
| tree | 52d874bb84648da86591a71c259598074db7753a /crypto | |
| parent | a51c816fe5996966915bcebb85010de524bdf0b2 (diff) | |
| parent | 5d8f02acff790f62a476754252fbbc6f5ce4250d (diff) | |
| download | linux-crypto-c5bc839de2485ae70d7f60a07d22da6183685e8d.tar.gz linux-crypto-c5bc839de2485ae70d7f60a07d22da6183685e8d.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.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/crypto/shash.c b/crypto/shash.c index 7a659733..2ccc8b00 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) ?: |