Commit b60e714d authored Sep 22, 2009 by Roland McGrath

x86: ptrace: sysret path should reach syscall_trace_leave

If TIF_SYSCALL_TRACE or TIF_SINGLESTEP is set while inside a syscall,
the path back to user mode should get to syscall_trace_leave.

This does happen in most circumstances. The exception to this is on
the 64-bit syscall fastpath, when no such flag was set on syscall
entry and nothing else has punted it off the fastpath for exit. That
one exit fastpath fails to check for _TIF_WORK_SYSCALL_EXIT flags.
This makes the behavior inconsistent with what 32-bit tasks see and
what the native 32-bit kernel always does, and what 64-bit tasks see
in all cases where the iret path is taken anyhow.

Perhaps the only example that is affected is a ptrace stop inside
do_fork (for PTRACE_O_TRACE{CLONE,FORK,VFORK,VFORKDONE}). Other
syscalls with internal ptrace stop points (execve) already take the
iret exit path for unrelated reasons.

Test cases for both PTRACE_SYSCALL and PTRACE_SINGLESTEP variants are at:
http://sources.redhat.com/cgi-bin/cvsweb.cgi/~checkout~/tests/ptrace-tests/tests/syscall-from-clone.c?cvsroot=systemtap
http://sources.redhat.com/cgi-bin/cvsweb.cgi/~checkout~/tests/ptrace-tests/tests/step-from-clone.c?cvsroot=systemtap

There was no special benefit to the sysret path's special path to call
do_notify_resume, because it always takes the iret exit path at the end.
So this change just makes the sysret exit path join the iret exit path
for all the signals and ptrace cases. The fastpath still applies to
the plain syscall-audit and resched cases.

Signed-off-by: Roland McGrath <roland@redhat.com>
CC: Oleg Nesterov <oleg@redhat.com>

parent 7fa07729

arch/x86/kernel/entry_64.S

+8 −14

Original line number	Diff line number	Diff line
		@@ -536,20 +536,13 @@ sysret_signal:
		bt $TIF_SYSCALL_AUDIT,%edx
		jc sysret_audit
		#endif
		/* edx: work flags (arg3) */
		leaq -ARGOFFSET(%rsp),%rdi # &pt_regs -> arg1
		xorl %esi,%esi # oldset -> arg2
		SAVE_REST
		FIXUP_TOP_OF_STACK %r11
		call do_notify_resume
		RESTORE_TOP_OF_STACK %r11
		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
		/*
		* We have a signal, or exit tracing or single-step.
		* These all wind up with the iret return path anyway,
		* so just join that path right now.
		*/
		FIXUP_TOP_OF_STACK %r11, -ARGOFFSET
		jmp int_check_syscall_exit_work

		badsys:
		movq $-ENOSYS,RAX-ARGOFFSET(%rsp)
		@@ -654,6 +647,7 @@ int_careful:
		int_very_careful:
		TRACE_IRQS_ON
		ENABLE_INTERRUPTS(CLBR_NONE)
		int_check_syscall_exit_work:
		SAVE_REST
		/* Check for syscall exit trace */
		testl $_TIF_WORK_SYSCALL_EXIT,%edx