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

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

signal/xtensa: 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: Max Filippov <jcmvbkbc@gmail.com>
Cc: Chris Zankel <chris@zankel.net>
Cc: linux-xtensa@linux-xtensa.org
Acked-by: default avatarMax Filippov <jcmvbkbc@gmail.com>
Signed-off-by: default avatar"Eric W. Biederman" <ebiederm@xmission.com>
parent 7de712cc

arch/xtensa/kernel/traps.c

+1 −9
Original line number Diff line number Diff line
@@ -323,8 +323,6 @@ do_illegal_instruction(struct pt_regs *regs) 
void

do_unaligned_user (struct pt_regs *regs)

{

	siginfo_t info;



	__die_if_kernel("Unhandled unaligned exception in kernel",

			regs, SIGKILL);
@@ -334,13 +332,7 @@ do_unaligned_user (struct pt_regs *regs) 
			    "(pid = %d, pc = %#010lx)\n",

			    regs->excvaddr, current->comm,

			    task_pid_nr(current), regs->pc);

	clear_siginfo(&info);

	info.si_signo = SIGBUS;

	info.si_errno = 0;

	info.si_code = BUS_ADRALN;

	info.si_addr = (void *) regs->excvaddr;

	force_sig_info(SIGBUS, &info, current);



	force_sig_fault(SIGBUS, BUS_ADRALN, (void *) regs->excvaddr, current);

}

#endif

arch/xtensa/mm/fault.c

+5 −14
Original line number Diff line number Diff line
@@ -39,14 +39,13 @@ void do_page_fault(struct pt_regs *regs) 
	struct mm_struct *mm = current->mm;

	unsigned int exccause = regs->exccause;

	unsigned int address = regs->excvaddr;

	siginfo_t info;

	int code;



	int is_write, is_exec;

	int fault;

	unsigned int flags = FAULT_FLAG_ALLOW_RETRY | FAULT_FLAG_KILLABLE;



	clear_siginfo(&info);

	info.si_code = SEGV_MAPERR;

	code = SEGV_MAPERR;



	/* We fault-in kernel-space virtual memory on-demand. The

	 * 'reference' page table is init_mm.pgd.
@@ -92,7 +91,7 @@ void do_page_fault(struct pt_regs *regs) 
	 */



good_area:

	info.si_code = SEGV_ACCERR;

	code = SEGV_ACCERR;



	if (is_write) {

		if (!(vma->vm_flags & VM_WRITE))
@@ -158,11 +157,7 @@ void do_page_fault(struct pt_regs *regs) 
	if (user_mode(regs)) {

		current->thread.bad_vaddr = address;

		current->thread.error_code = is_write;

		info.si_signo = SIGSEGV;

		info.si_errno = 0;

		/* info.si_code has been set above */

		info.si_addr = (void *) address;

		force_sig_info(SIGSEGV, &info, current);

		force_sig_fault(SIGSEGV, code, (void *) address, current);

		return;

	}

	bad_page_fault(regs, address, SIGSEGV);
@@ -187,11 +182,7 @@ void do_page_fault(struct pt_regs *regs) 
	 * or user mode.

	 */

	current->thread.bad_vaddr = address;

	info.si_code = SIGBUS;

	info.si_errno = 0;

	info.si_code = BUS_ADRERR;

	info.si_addr = (void *) address;

	force_sig_info(SIGBUS, &info, current);

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



	/* Kernel mode? Handle exceptions or die */

	if (!user_mode(regs))