Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6f467986 authored by Eric W. Biederman's avatar Eric W. Biederman
Browse files

signal/microblaze: Use force_sig_fault where appropriate 



Filling in struct siginfo before calling force_sig_info a tedious and
error prone process, where once in a great while the wrong fields
are filled out, and siginfo has been inconsistently cleared.

Simplify this process by using the helper force_sig_fault.  Which
takes as a parameters all of the information it needs, ensures
all of the fiddly bits of filling in struct siginfo are done properly
and then calls force_sig_info.

In short about a 5 line reduction in code for every time force_sig_info
is called, which makes the calling function clearer.

Cc: Michal Simek <monstr@monstr.eu>
Signed-off-by: default avatar"Eric W. Biederman" <ebiederm@xmission.com>
parent ceb91ed1

arch/microblaze/kernel/exceptions.c

+1 −8
Original line number Diff line number Diff line
@@ -60,17 +60,10 @@ asmlinkage void sw_exception(struct pt_regs *regs) 


void _exception(int signr, struct pt_regs *regs, int code, unsigned long addr)

{

	siginfo_t info;



	if (kernel_mode(regs))

		die("Exception in kernel mode", regs, signr);



	clear_siginfo(&info);

	info.si_signo = signr;

	info.si_errno = 0;

	info.si_code = code;

	info.si_addr = (void __user *) addr;

	force_sig_info(signr, &info, current);

	force_sig_fault(signr, code, (void __user *)addr, current);

}



asmlinkage void full_exception(struct pt_regs *regs, unsigned int type,

arch/microblaze/mm/fault.c

+1 −8
Original line number Diff line number Diff line
@@ -289,14 +289,7 @@ void do_page_fault(struct pt_regs *regs, unsigned long address, 
do_sigbus:

	up_read(&mm->mmap_sem);

	if (user_mode(regs)) {

		siginfo_t info;



		clear_siginfo(&info);

		info.si_signo = SIGBUS;

		info.si_errno = 0;

		info.si_code = BUS_ADRERR;

		info.si_addr = (void __user *)address;

		force_sig_info(SIGBUS, &info, current);

		force_sig_fault(SIGBUS, BUS_ADRERR, (void __user *)address, current);

		return;

	}

	bad_page_fault(regs, address, SIGBUS);