OSDN Git Service
(root)
/
tomoyo
/
tomoyo-test1.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
af2e140
)
x86/vsyscall_emu/64: Don't use RET in vsyscall emulation
author
Peter Zijlstra
<peterz@infradead.org>
Tue, 14 Jun 2022 21:15:43 +0000
(23:15 +0200)
committer
Borislav Petkov
<bp@suse.de>
Mon, 27 Jun 2022 08:33:58 +0000
(10:33 +0200)
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>
arch/x86/entry/vsyscall/vsyscall_emu_64.S
patch
|
blob
|
history
diff --git
a/arch/x86/entry/vsyscall/vsyscall_emu_64.S
b/arch/x86/entry/vsyscall/vsyscall_emu_64.S
index
15e3515
..
ef2dd18
100644
(file)
--- 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