Skip to content

Commit 15583e5

Browse files
Peter Zijlstrasuryasaimadhu
authored andcommitted
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>
1 parent af2e140 commit 15583e5

File tree

1 file changed

+6
-3
lines changed

1 file changed

+6
-3
lines changed

arch/x86/entry/vsyscall/vsyscall_emu_64.S

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,17 +19,20 @@ __vsyscall_page:
1919

2020
mov $__NR_gettimeofday, %rax
2121
syscall
22-
RET
22+
ret
23+
int3
2324

2425
.balign 1024, 0xcc
2526
mov $__NR_time, %rax
2627
syscall
27-
RET
28+
ret
29+
int3
2830

2931
.balign 1024, 0xcc
3032
mov $__NR_getcpu, %rax
3133
syscall
32-
RET
34+
ret
35+
int3
3336

3437
.balign 4096, 0xcc
3538

0 commit comments

Comments
 (0)