diff --git a/[refs] b/[refs]
index 702b2f9cd3c0..4f8df943026a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3341323bb4c198f704cffbfdda37bcec1226ef7d
+refs/heads/master: f4f689933c63e0fbfba62f2a80efb2b424b139ae
diff --git a/trunk/crypto/shash.c b/trunk/crypto/shash.c
index 7a659733f94a..2ccc8b0076ce 100644
--- a/trunk/crypto/shash.c
+++ b/trunk/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) ?: