Commit 28d42ea1 authored by Eric W. Biederman's avatar Eric W. Biederman
Browse files

signal/x86: Remove task parameter from send_sigtrap 



The send_sigtrap function is always called with task == current.  Make
that explicit by removing the task parameter.

This also makes it clear that the x86 send_sigtrap passes current
into force_sig_fault.

Reviewed-by: default avatarThomas Gleixner <tglx@linutronix.de>
Signed-off-by: default avatar"Eric W. Biederman" <ebiederm@xmission.com>
parent f8eac901

arch/x86/include/asm/ptrace.h

+1 −2
Original line number Diff line number Diff line
@@ -102,8 +102,7 @@ extern unsigned long profile_pc(struct pt_regs *regs); 


extern unsigned long

convert_ip_to_linear(struct task_struct *child, struct pt_regs *regs);

extern void send_sigtrap(struct task_struct *tsk, struct pt_regs *regs,

			 int error_code, int si_code);

extern void send_sigtrap(struct pt_regs *regs, int error_code, int si_code);





static inline unsigned long regs_return_value(struct pt_regs *regs)

arch/x86/kernel/ptrace.c

+4 −3
Original line number Diff line number Diff line
@@ -1360,9 +1360,10 @@ const struct user_regset_view *task_user_regset_view(struct task_struct *task) 
#endif

}



void send_sigtrap(struct task_struct *tsk, struct pt_regs *regs,

					 int error_code, int si_code)

void send_sigtrap(struct pt_regs *regs, int error_code, int si_code)

{

	struct task_struct *tsk = current;



	tsk->thread.trap_nr = X86_TRAP_DB;

	tsk->thread.error_code = error_code;
@@ -1373,5 +1374,5 @@ void send_sigtrap(struct task_struct *tsk, struct pt_regs *regs, 


void user_single_step_report(struct pt_regs *regs)

{

	send_sigtrap(current, regs, 0, TRAP_BRKPT);

	send_sigtrap(regs, 0, TRAP_BRKPT);

}

arch/x86/kernel/traps.c

+1 −1
Original line number Diff line number Diff line
@@ -805,7 +805,7 @@ dotraplinkage void do_debug(struct pt_regs *regs, long error_code) 
	}

	si_code = get_si_code(tsk->thread.debugreg6);

	if (tsk->thread.debugreg6 & (DR_STEP | DR_TRAP_BITS) || user_icebp)

		send_sigtrap(tsk, regs, error_code, si_code);

		send_sigtrap(regs, error_code, si_code);

	cond_local_irq_disable(regs);

	debug_stack_usage_dec();

CRA Git | Maintained and supported by SUSTech CRA and CCSE