Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

ARM: 7425/1: extable: ensure fixup entries are 4-byte aligned

Fixup entries in the kernel exception tables should be 4-byte aligned
since we return directly to them when handling a faulting instruction in
the kernel.

This patch adds the missing align directives to the fixup entries.

Signed-off-by: Will Deacon <will.deacon@arm.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

authored by

Will Deacon and committed by
Russell King
667d1b48 2bea29b7

+2
+1
arch/arm/include/asm/futex.h
··· 19 19 " .long 1b, 4f, 2b, 4f\n" \ 20 20 " .popsection\n" \ 21 21 " .pushsection .fixup,\"ax\"\n" \ 22 + " .align 2\n" \ 22 23 "4: mov %0, " err_reg "\n" \ 23 24 " b 3b\n" \ 24 25 " .popsection"
+1
arch/arm/kernel/entry-armv.S
··· 495 495 * The out of line fixup for the ldrt above. 496 496 */ 497 497 .pushsection .fixup, "ax" 498 + .align 2 498 499 4: mov pc, r9 499 500 .popsection 500 501 .pushsection __ex_table,"a"