Commit 07464787 authored by Andy Polyakov's avatar Andy Polyakov
Browse files

crypto/modes/modes_lcl.h: let STRICT_ALIGNMENT be on ARMv7. 

While ARMv7 in general is capable of unaligned access, not all instructions
actually are. And trouble is that compiler doesn't seem to differentiate
those capable and incapable of unaligned access. Side effect is that kernel
goes into endless loop retrying same instruction triggering unaligned trap.
Problem was observed in xts128.c and ccm128.c modules. It's possible to
resolve it by using (volatile u32*) casts, but letting STRICT_ALIGNMENT
be feels more appropriate.
(cherry picked from commit 3bdd8052)
parent e9a3aa97

crypto/modes/modes_lcl.h

+1 −4
Original line number Diff line number Diff line
@@ -29,10 +29,7 @@ typedef unsigned char u8; 
#if defined(__i386)	|| defined(__i386__)	|| \

    defined(__x86_64)	|| defined(__x86_64__)	|| \

    defined(_M_IX86)	|| defined(_M_AMD64)	|| defined(_M_X64) || \

    defined(__s390__)	|| defined(__s390x__)	|| \

    ( (defined(__arm__)	|| defined(__arm)) && \

      (defined(__ARM_ARCH_7__)	|| defined(__ARM_ARCH_7A__) || \

       defined(__ARM_ARCH_7R__)	|| defined(__ARM_ARCH_7M__)) )

    defined(__s390__)	|| defined(__s390x__)

# undef STRICT_ALIGNMENT

#endif