Commit 6341c393 authored by Roland McGrath's avatar Roland McGrath Committed by Linus Torvalds
Browse files

tracehook: exec 



This moves all the ptrace hooks related to exec into tracehook.h inlines.

This also lifts the calls for tracing out of the binfmt load_binary hooks
into search_binary_handler() after it calls into the binfmt module.  This
change has no effect, since all the binfmt modules' load_binary functions
did the call at the end on success, and now search_binary_handler() does
it immediately after return if successful.  We consolidate the repeated
code, and binfmt modules no longer need to import ptrace_notify().

Signed-off-by: default avatarRoland McGrath <roland@redhat.com>
Cc: Oleg Nesterov <oleg@tv-sign.ru>
Reviewed-by: default avatarIngo Molnar <mingo@elte.hu>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 88ac2921

arch/x86/ia32/ia32_aout.c

+0 −6
Original line number Diff line number Diff line
@@ -441,12 +441,6 @@ beyond_if: 
	regs->r8 = regs->r9 = regs->r10 = regs->r11 =

	regs->r12 = regs->r13 = regs->r14 = regs->r15 = 0;

	set_fs(USER_DS);

	if (unlikely(current->ptrace & PT_PTRACED)) {

		if (current->ptrace & PT_TRACE_EXEC)

			ptrace_notify((PTRACE_EVENT_EXEC << 8) | SIGTRAP);

		else

			send_sig(SIGTRAP, current, 0);

	}

	return 0;

}

fs/binfmt_aout.c

+0 −6
Original line number Diff line number Diff line
@@ -444,12 +444,6 @@ beyond_if: 
	regs->gp = ex.a_gpvalue;

#endif

	start_thread(regs, ex.a_entry, current->mm->start_stack);

	if (unlikely(current->ptrace & PT_PTRACED)) {

		if (current->ptrace & PT_TRACE_EXEC)

			ptrace_notify ((PTRACE_EVENT_EXEC << 8) | SIGTRAP);

		else

			send_sig(SIGTRAP, current, 0);

	}

	return 0;

}

fs/binfmt_elf.c

+0 −6
Original line number Diff line number Diff line
@@ -1003,12 +1003,6 @@ static int load_elf_binary(struct linux_binprm *bprm, struct pt_regs *regs) 
#endif



	start_thread(regs, elf_entry, bprm->p);

	if (unlikely(current->ptrace & PT_PTRACED)) {

		if (current->ptrace & PT_TRACE_EXEC)

			ptrace_notify ((PTRACE_EVENT_EXEC << 8) | SIGTRAP);

		else

			send_sig(SIGTRAP, current, 0);

	}

	retval = 0;

out:

	kfree(loc);

fs/binfmt_elf_fdpic.c

+0 −7
Original line number Diff line number Diff line
@@ -433,13 +433,6 @@ static int load_elf_fdpic_binary(struct linux_binprm *bprm, 
	entryaddr = interp_params.entry_addr ?: exec_params.entry_addr;

	start_thread(regs, entryaddr, current->mm->start_stack);



	if (unlikely(current->ptrace & PT_PTRACED)) {

		if (current->ptrace & PT_TRACE_EXEC)

			ptrace_notify((PTRACE_EVENT_EXEC << 8) | SIGTRAP);

		else

			send_sig(SIGTRAP, current, 0);

	}



	retval = 0;



error:

fs/binfmt_flat.c

+0 −3
Original line number Diff line number Diff line
@@ -920,9 +920,6 @@ static int load_flat_binary(struct linux_binprm * bprm, struct pt_regs * regs) 
	

	start_thread(regs, start_addr, current->mm->start_stack);



	if (current->ptrace & PT_PTRACED)

		send_sig(SIGTRAP, current, 0);



	return 0;

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE