diff options
Diffstat (limited to 'arch/i386')
-rw-r--r-- | arch/i386/kernel/ptrace.c | 23 |
1 files changed, 20 insertions, 3 deletions
diff --git a/arch/i386/kernel/ptrace.c b/arch/i386/kernel/ptrace.c index 3196ba50fcd5..340980203b09 100644 --- a/arch/i386/kernel/ptrace.c +++ b/arch/i386/kernel/ptrace.c | |||
@@ -271,6 +271,8 @@ static void clear_singlestep(struct task_struct *child) | |||
271 | void ptrace_disable(struct task_struct *child) | 271 | void ptrace_disable(struct task_struct *child) |
272 | { | 272 | { |
273 | clear_singlestep(child); | 273 | clear_singlestep(child); |
274 | clear_tsk_thread_flag(child, TIF_SYSCALL_TRACE); | ||
275 | clear_tsk_thread_flag(child, TIF_SYSCALL_EMU); | ||
274 | } | 276 | } |
275 | 277 | ||
276 | /* | 278 | /* |
@@ -693,14 +695,29 @@ __attribute__((regparm(3))) | |||
693 | int do_syscall_trace(struct pt_regs *regs, int entryexit) | 695 | int do_syscall_trace(struct pt_regs *regs, int entryexit) |
694 | { | 696 | { |
695 | int is_sysemu = test_thread_flag(TIF_SYSCALL_EMU), ret = 0; | 697 | int is_sysemu = test_thread_flag(TIF_SYSCALL_EMU), ret = 0; |
696 | /* With TIF_SYSCALL_EMU set we want to ignore TIF_SINGLESTEP */ | 698 | /* With TIF_SYSCALL_EMU set we want to ignore TIF_SINGLESTEP for syscall |
699 | * interception. */ | ||
697 | int is_singlestep = !is_sysemu && test_thread_flag(TIF_SINGLESTEP); | 700 | int is_singlestep = !is_sysemu && test_thread_flag(TIF_SINGLESTEP); |
698 | 701 | ||
699 | /* do the secure computing check first */ | 702 | /* do the secure computing check first */ |
700 | secure_computing(regs->orig_eax); | 703 | secure_computing(regs->orig_eax); |
701 | 704 | ||
702 | if (unlikely(current->audit_context) && entryexit) | 705 | if (unlikely(current->audit_context)) { |
703 | audit_syscall_exit(current, AUDITSC_RESULT(regs->eax), regs->eax); | 706 | if (entryexit) |
707 | audit_syscall_exit(current, AUDITSC_RESULT(regs->eax), regs->eax); | ||
708 | /* Debug traps, when using PTRACE_SINGLESTEP, must be sent only | ||
709 | * on the syscall exit path. Normally, when TIF_SYSCALL_AUDIT is | ||
710 | * not used, entry.S will call us only on syscall exit, not | ||
711 | * entry; so when TIF_SYSCALL_AUDIT is used we must avoid | ||
712 | * calling send_sigtrap() on syscall entry. | ||
713 | * | ||
714 | * Note that when PTRACE_SYSEMU_SINGLESTEP is used, | ||
715 | * is_singlestep is false, despite his name, so we will still do | ||
716 | * the correct thing. | ||
717 | */ | ||
718 | else if (is_singlestep) | ||
719 | goto out; | ||
720 | } | ||
704 | 721 | ||
705 | if (!(current->ptrace & PT_PTRACED)) | 722 | if (!(current->ptrace & PT_PTRACED)) |
706 | goto out; | 723 | goto out; |