diff options
| author |   Peter Zijlstra <peterz@infradead.org> | 2022-06-14 23:15:43 +0200 |
|---|---|---|
| committer |   Borislav Petkov <bp@suse.de> | 2022-06-27 10:33:58 +0200 |
| commit | 15583e514eb16744b80be85dea0774ece153177d (patch) | |
| tree | 9b09098c7d83917763dde27ad078a39f9e4a632a /arch/x86/entry/vsyscall/vsyscall_emu_64.S | |
| parent | x86/kvm: Fix SETcc emulation for return thunks (diff) | |
| download | linux-dev-15583e514eb16744b80be85dea0774ece153177d.tar.xz linux-dev-15583e514eb16744b80be85dea0774ece153177d.zip | |
x86/vsyscall_emu/64: Don't use RET in vsyscall emulation
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>
Diffstat (limited to 'arch/x86/entry/vsyscall/vsyscall_emu_64.S')
| -rw-r--r-- | arch/x86/entry/vsyscall/vsyscall_emu_64.S | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/arch/x86/entry/vsyscall/vsyscall_emu_64.S b/arch/x86/entry/vsyscall/vsyscall_emu_64.S index 15e35159ebb6..ef2dd1827243 100644 --- a/arch/x86/entry/vsyscall/vsyscall_emu_64.S +++ b/arch/x86/entry/vsyscall/vsyscall_emu_64.S @@ -19,17 +19,20 @@ __vsyscall_page: mov $__NR_gettimeofday, %rax syscall - RET + ret + int3 .balign 1024, 0xcc mov $__NR_time, %rax syscall - RET + ret + int3 .balign 1024, 0xcc mov $__NR_getcpu, %rax syscall - RET + ret + int3 .balign 4096, 0xcc |