mirror of
https://github.com/adulau/aha.git
synced 2025-01-03 22:53:18 +00:00
[PATCH] x86_64: Clean up execve path
Just call IRET always, no need for any special cases. Needed for the next bug fix. Signed-off-by: Andi Kleen <ak@suse.de> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
parent
903fcc608e
commit
805e8c03c9
1 changed files with 0 additions and 16 deletions
|
@ -408,25 +408,9 @@ ENTRY(stub_execve)
|
|||
CFI_ADJUST_CFA_OFFSET -8
|
||||
CFI_REGISTER rip, r11
|
||||
SAVE_REST
|
||||
movq %r11, %r15
|
||||
CFI_REGISTER rip, r15
|
||||
FIXUP_TOP_OF_STACK %r11
|
||||
call sys_execve
|
||||
GET_THREAD_INFO(%rcx)
|
||||
bt $TIF_IA32,threadinfo_flags(%rcx)
|
||||
CFI_REMEMBER_STATE
|
||||
jc exec_32bit
|
||||
RESTORE_TOP_OF_STACK %r11
|
||||
movq %r15, %r11
|
||||
CFI_REGISTER rip, r11
|
||||
RESTORE_REST
|
||||
pushq %r11
|
||||
CFI_ADJUST_CFA_OFFSET 8
|
||||
CFI_REL_OFFSET rip, 0
|
||||
ret
|
||||
|
||||
exec_32bit:
|
||||
CFI_RESTORE_STATE
|
||||
movq %rax,RAX(%rsp)
|
||||
RESTORE_REST
|
||||
jmp int_ret_from_sys_call
|
||||
|
|
Loading…
Reference in a new issue