]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
crypto: shash - Fix unaligned calculation with short length
authorYehuda Sadeh <yehuda@hq.newdream.net>
Fri, 27 Mar 2009 05:03:51 +0000 (13:03 +0800)
committerHerbert Xu <herbert@gondor.apana.org.au>
Fri, 27 Mar 2009 05:03:51 +0000 (13:03 +0800)
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>
crypto/shash.c

index 7a659733f94a4e1087fabcfc8d5e48fd6c5c4521..2ccc8b0076ce36ed7d67ff6202e44e90076d7ee2 100644 (file)
@@ -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) ?: