Commit 805e8c03c9ea9bdb402a36341e02ec24825d5417
Committed by
Linus Torvalds
Linus Torvalds
1 parent
903fcc608e
Exists in
master
and in
7 other branches
[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>
Showing 1 changed file with 0 additions and 16 deletions Side-by-side Diff
arch/x86_64/kernel/entry.S
| ... | ... | @@ -408,25 +408,9 @@ |
| 408 | 408 | CFI_ADJUST_CFA_OFFSET -8 |
| 409 | 409 | CFI_REGISTER rip, r11 |
| 410 | 410 | SAVE_REST |
| 411 | - movq %r11, %r15 | |
| 412 | - CFI_REGISTER rip, r15 | |
| 413 | 411 | FIXUP_TOP_OF_STACK %r11 |
| 414 | 412 | call sys_execve |
| 415 | - GET_THREAD_INFO(%rcx) | |
| 416 | - bt $TIF_IA32,threadinfo_flags(%rcx) | |
| 417 | - CFI_REMEMBER_STATE | |
| 418 | - jc exec_32bit | |
| 419 | 413 | RESTORE_TOP_OF_STACK %r11 |
| 420 | - movq %r15, %r11 | |
| 421 | - CFI_REGISTER rip, r11 | |
| 422 | - RESTORE_REST | |
| 423 | - pushq %r11 | |
| 424 | - CFI_ADJUST_CFA_OFFSET 8 | |
| 425 | - CFI_REL_OFFSET rip, 0 | |
| 426 | - ret | |
| 427 | - | |
| 428 | -exec_32bit: | |
| 429 | - CFI_RESTORE_STATE | |
| 430 | 414 | movq %rax,RAX(%rsp) |
| 431 | 415 | RESTORE_REST |
| 432 | 416 | jmp int_ret_from_sys_call |