Skip to content

Commit f87b1c4

Browse files
keesRussell King
authored andcommitted
ARM: 8958/1: rename missed uaccess .fixup section
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#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]>
1 parent 45939ce commit f87b1c4

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
@@ -118,7 +118,7 @@ ENTRY(arm_copy_from_user)
118118

119119
ENDPROC(arm_copy_from_user)
120120

121-
.pushsection .fixup,"ax"
121+
.pushsection .text.fixup,"ax"
122122
.align 0
123123
copy_abort_preamble
124124
ldmfd sp!, {r1, r2, r3}

0 commit comments

Comments
 (0)