Commit 24b8f79d authored by Eric W. Biederman's avatar Eric W. Biederman
Browse files

signal/arm64: Remove unneeded tsk parameter from arm64_force_sig_info 



Every caller passes in current for tsk so there is no need to pass
tsk.  Instead make tsk a local variable initialized to current.

Reviewed-by: default avatarCatalin Marinas <catalin.marinas@arm.com>
Tested-by: default avatarCatalin Marinas <catalin.marinas@arm.com>
Signed-off-by: default avatar"Eric W. Biederman" <ebiederm@xmission.com>
parent 6fa998e8

arch/arm64/include/asm/traps.h

+1 −2
Original line number Diff line number Diff line
@@ -37,8 +37,7 @@ void register_undef_hook(struct undef_hook *hook); 
void unregister_undef_hook(struct undef_hook *hook);

void force_signal_inject(int signal, int code, unsigned long address);

void arm64_notify_segfault(unsigned long addr);

void arm64_force_sig_info(struct siginfo *info, const char *str,

			  struct task_struct *tsk);

void arm64_force_sig_info(struct siginfo *info, const char *str);



/*

 * Move regs->pc to next instruction and do necessary setup before it

arch/arm64/kernel/debug-monitors.c

+1 −1
Original line number Diff line number Diff line
@@ -224,7 +224,7 @@ static void send_user_sigtrap(int si_code) 
	if (interrupts_enabled(regs))

		local_irq_enable();



	arm64_force_sig_info(&info, "User debug trap", current);

	arm64_force_sig_info(&info, "User debug trap");

}



static int single_step_handler(unsigned long addr, unsigned int esr,

arch/arm64/kernel/ptrace.c

+1 −1
Original line number Diff line number Diff line
@@ -211,7 +211,7 @@ static void ptrace_hbptriggered(struct perf_event *bp, 
		force_sig_ptrace_errno_trap(si_errno, (void __user *)bkpt->trigger);

	}

#endif

	arm64_force_sig_info(&info, "Hardware breakpoint trap (ptrace)", current);

	arm64_force_sig_info(&info, "Hardware breakpoint trap (ptrace)");

}



/*

arch/arm64/kernel/traps.c

+4 −4
Original line number Diff line number Diff line
@@ -231,9 +231,9 @@ static bool show_unhandled_signals_ratelimited(void) 
	return show_unhandled_signals && __ratelimit(&rs);

}



void arm64_force_sig_info(struct siginfo *info, const char *str,

			  struct task_struct *tsk)

void arm64_force_sig_info(struct siginfo *info, const char *str)

{

	struct task_struct *tsk = current;

	unsigned int esr = tsk->thread.fault_code;

	struct pt_regs *regs = task_pt_regs(tsk);
@@ -273,7 +273,7 @@ void arm64_notify_die(const char *str, struct pt_regs *regs, 
		info.si_code  = sicode;

		info.si_addr  = addr;



		arm64_force_sig_info(&info, str, current);

		arm64_force_sig_info(&info, str);

	} else {

		die(str, regs, err);

	}
@@ -630,7 +630,7 @@ asmlinkage void bad_el0_sync(struct pt_regs *regs, int reason, unsigned int esr) 
	current->thread.fault_address = 0;

	current->thread.fault_code = esr;



	arm64_force_sig_info(&info, "Bad EL0 synchronous exception", current);

	arm64_force_sig_info(&info, "Bad EL0 synchronous exception");

}



#ifdef CONFIG_VMAP_STACK

arch/arm64/mm/fault.c

+1 −1
Original line number Diff line number Diff line
@@ -352,7 +352,7 @@ static void __do_user_fault(struct siginfo *info, unsigned int esr) 
	}



	current->thread.fault_code = esr;

	arm64_force_sig_info(info, esr_to_fault_info(esr)->name, current);

	arm64_force_sig_info(info, esr_to_fault_info(esr)->name);

}



static void do_bad_area(unsigned long addr, unsigned int esr, struct pt_regs *regs)

CRA Git | Maintained and supported by SUSTech CRA and CCSE