UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'x86/ptrace-syscall-exit' of git://git.kernel.org/pub/scm/linux/kernel/git/frob/linux-2.6-roland 

* 'x86/ptrace-syscall-exit' of git://git.kernel.org/pub/scm/linux/kernel/git/frob/linux-2.6-roland:
  x86: ptrace: sysret path should reach syscall_trace_leave
This commit is contained in:
Linus Torvalds 2009-09-23 10:11:26 -07:00
parent 433c24ed7f b60e714dc3
commit d19110baaf
1 changed files with 8 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
arch/x86/kernel/entry_64.S
View File

@ -536,20 +536,13 @@ sysret_signal:
bt $TIF_SYSCALL_AUDIT,%edx bt $TIF_SYSCALL_AUDIT,%edx
jc sysret_audit jc sysret_audit
#endif #endif
/* edx: work flags (arg3) */ /*
leaq -ARGOFFSET(%rsp),%rdi # &pt_regs -> arg1 * We have a signal, or exit tracing or single-step.
xorl %esi,%esi # oldset -> arg2 * These all wind up with the iret return path anyway,
SAVE_REST * so just join that path right now.
FIXUP_TOP_OF_STACK %r11 */
call do_notify_resume FIXUP_TOP_OF_STACK %r11, -ARGOFFSET
RESTORE_TOP_OF_STACK %r11 jmp int_check_syscall_exit_work
RESTORE_REST
movl $_TIF_WORK_MASK,%edi
/* Use IRET because user could have changed frame. This
works because ptregscall_common has called FIXUP_TOP_OF_STACK. */
DISABLE_INTERRUPTS(CLBR_NONE)
TRACE_IRQS_OFF
jmp int_with_check
badsys: badsys:
movq $-ENOSYS,RAX-ARGOFFSET(%rsp) movq $-ENOSYS,RAX-ARGOFFSET(%rsp)
@ -654,6 +647,7 @@ int_careful:
int_very_careful: int_very_careful:
TRACE_IRQS_ON TRACE_IRQS_ON
ENABLE_INTERRUPTS(CLBR_NONE) ENABLE_INTERRUPTS(CLBR_NONE)
int_check_syscall_exit_work:
SAVE_REST SAVE_REST
/* Check for syscall exit trace */ /* Check for syscall exit trace */
testl $_TIF_WORK_SYSCALL_EXIT,%edx testl $_TIF_WORK_SYSCALL_EXIT,%edx