xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

x86/vsyscall_emu/64: Don't use RET in vsyscall emulation

Browse Source 
commit 15583e514eb16744b80be85dea0774ece153177d upstream.

This is userspace code and doesn't play by the normal kernel rules.

Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Signed-off-by: Borislav Petkov <bp@suse.de>
Reviewed-by: Josh Poimboeuf <jpoimboe@kernel.org>
Signed-off-by: Borislav Petkov <bp@suse.de>
Signed-off-by: Thadeu Lima de Souza Cascardo <cascardo@canonical.com>
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Peter Zijlstra
2022-06-14 23:15:43 +02:00
committed by Greg Kroah-Hartman
parent ee4996f07d
commit d6eb50e9b7
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
arch/x86/entry/vsyscall/vsyscall_emu_64.S
View File

@@ -19,17 +19,20 @@ __vsyscall_page:
mov $__NR_gettimeofday, %rax mov $__NR_gettimeofday, %rax
syscall syscall
RET ret
int3
.balign 1024, 0xcc .balign 1024, 0xcc
mov $__NR_time, %rax mov $__NR_time, %rax
syscall syscall
RET ret
int3
.balign 1024, 0xcc .balign 1024, 0xcc
mov $__NR_getcpu, %rax mov $__NR_getcpu, %rax
syscall syscall
RET ret
int3
.balign 4096, 0xcc .balign 4096, 0xcc