diff options
Diffstat (limited to 'crypto')
-rw-r--r-- | crypto/shash.c | 3 | ||||
-rw-r--r-- | crypto/xor.c | 2 |
2 files changed, 4 insertions, 1 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) ?: diff --git a/crypto/xor.c b/crypto/xor.c index b2e6db075e4..996b6ee57d9 100644 --- a/crypto/xor.c +++ b/crypto/xor.c @@ -18,8 +18,8 @@ #define BH_TRACE 0 #include <linux/module.h> -#include <linux/raid/md.h> #include <linux/raid/xor.h> +#include <linux/jiffies.h> #include <asm/xor.h> /* The xor routines to use. */ |