Skip to content

Commit 661345a

Browse files
keesLinuxGuy312
authored andcommitted
ARM: 8958/1: rename missed uaccess .fixup section
commit f87b1c49bc675da30d8e1e8f4b60b800312c7b90 upstream. When the uaccess .fixup section was renamed to .text.fixup, one case was missed. Under ld.bfd, the orphaned section was moved close to .text (since they share the "ax" bits), so things would work normally on uaccess faults. Under ld.lld, the orphaned section was placed outside the .text section, making it unreachable. Link: ClangBuiltLinux/linux#282 Link: https://bugs.chromium.org/p/chromium/issues/detail?id=1020633#c44 Link: https://lore.kernel.org/r/[email protected] Link: https://lore.kernel.org/lkml/202002071754.F5F073F1D@keescook/ Fixes: c4a84ae ("ARM: 8322/1: keep .text and .fixup regions closer together") Cc: [email protected] Signed-off-by: Kees Cook <[email protected]> Reviewed-by: Ard Biesheuvel <[email protected]> Reviewed-by: Nick Desaulniers <[email protected]> Signed-off-by: Russell King <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
1 parent f5f9b66 commit 661345a

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

arch/arm/lib/copy_from_user.S

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ ENTRY(arm_copy_from_user)
100100

101101
ENDPROC(arm_copy_from_user)
102102

103-
.pushsection .fixup,"ax"
103+
.pushsection .text.fixup,"ax"
104104
.align 0
105105
copy_abort_preamble
106106
ldmfd sp!, {r1, r2, r3}

0 commit comments

Comments
 (0)