diff options
| author | Josh Poimboeuf | 2019-07-18 03:36:42 +0200 |
|---|---|---|
| committer | Thomas Gleixner | 2019-07-18 21:01:05 +0200 |
| commit | 3a6ab4bcc52263dd5b1d2fd2e4ce95a38c798b4d (patch) | |
| tree | a7732d2432182026cf2ac8f7a7f4c789a4673188 /arch/x86/lib | |
| parent | x86/head/64: Annotate start_cpu0() as non-callable (diff) | |
| download | kernel-qcow2-linux-3a6ab4bcc52263dd5b1d2fd2e4ce95a38c798b4d.tar.gz kernel-qcow2-linux-3a6ab4bcc52263dd5b1d2fd2e4ce95a38c798b4d.tar.xz kernel-qcow2-linux-3a6ab4bcc52263dd5b1d2fd2e4ce95a38c798b4d.zip | |
x86/uaccess: Remove ELF function annotation from copy_user_handle_tail()
After an objtool improvement, it's complaining about the CLAC in
copy_user_handle_tail():
arch/x86/lib/copy_user_64.o: warning: objtool: .altinstr_replacement+0x12: redundant UACCESS disable
arch/x86/lib/copy_user_64.o: warning: objtool: copy_user_handle_tail()+0x6: (alt)
arch/x86/lib/copy_user_64.o: warning: objtool: copy_user_handle_tail()+0x2: (alt)
arch/x86/lib/copy_user_64.o: warning: objtool: copy_user_handle_tail()+0x0: <=== (func)
copy_user_handle_tail() is incorrectly marked as a callable function, so
objtool is rightfully concerned about the CLAC with no corresponding
STAC.
Remove the ELF function annotation. The copy_user_handle_tail() code
path is already verified by objtool because it's jumped to by other
callable asm code (which does the corresponding STAC).
Signed-off-by: Josh Poimboeuf <jpoimboe@redhat.com>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Acked-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Link: https://lkml.kernel.org/r/6b6e436774678b4b9873811ff023bd29935bee5b.1563413318.git.jpoimboe@redhat.com
Diffstat (limited to 'arch/x86/lib')
| -rw-r--r-- | arch/x86/lib/copy_user_64.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/lib/copy_user_64.S b/arch/x86/lib/copy_user_64.S index 378a1f70ae7d..4fe1601dbc5d 100644 --- a/arch/x86/lib/copy_user_64.S +++ b/arch/x86/lib/copy_user_64.S @@ -239,7 +239,7 @@ copy_user_handle_tail: ret _ASM_EXTABLE_UA(1b, 2b) -ENDPROC(copy_user_handle_tail) +END(copy_user_handle_tail) /* * copy_user_nocache - Uncached memory copy with exception handling |