diff options
| author | Yehuda Sadeh <yehuda@hq.newdream.net> | 2009-03-27 01:03:51 -0400 |
|---|---|---|
| committer | Herbert Xu <herbert@gondor.apana.org.au> | 2009-03-27 01:03:51 -0400 |
| commit | f4f689933c63e0fbfba62f2a80efb2b424b139ae (patch) | |
| tree | 6dfaca5c03cd0036df3ab393824fe311ce78855a /crypto | |
| parent | 3341323bb4c198f704cffbfdda37bcec1226ef7d (diff) | |
crypto: shash - Fix unaligned calculation with short length
When the total length is shorter than the calculated number of unaligned bytes, the call to shash->update breaks. For example, calling crc32c on unaligned buffer with length of 1 can result in a system crash.
Signed-off-by: Yehuda Sadeh <yehuda@hq.newdream.net>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
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 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) ?: |