Commit 93e95fa5 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'siginfo-linus' of... 

Merge branch 'siginfo-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace

Pull siginfo updates from Eric Biederman:
 "This set of changes close the known issues with setting si_code to an
  invalid value, and with not fully initializing struct siginfo. There
  remains work to do on nds32, arc, unicore32, powerpc, arm, arm64, ia64
  and x86 to get the code that generates siginfo into a simpler and more
  maintainable state. Most of that work involves refactoring the signal
  handling code and thus careful code review.

  Also not included is the work to shrink the in kernel version of
  struct siginfo. That depends on getting the number of places that
  directly manipulate struct siginfo under control, as it requires the
  introduction of struct kernel_siginfo for the in kernel things.

  Overall this set of changes looks like it is making good progress, and
  with a little luck I will be wrapping up the siginfo work next
  development cycle"

* 'siginfo-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace: (46 commits)
  signal/sh: Stop gcc warning about an impossible case in do_divide_error
  signal/mips: Report FPE_FLTUNK for undiagnosed floating point exceptions
  signal/um: More carefully relay signals in relay_signal.
  signal: Extend siginfo_layout with SIL_FAULT_{MCEERR|BNDERR|PKUERR}
  signal: Remove unncessary #ifdef SEGV_PKUERR in 32bit compat code
  signal/signalfd: Add support for SIGSYS
  signal/signalfd: Remove __put_user from signalfd_copyinfo
  signal/xtensa: Use force_sig_fault where appropriate
  signal/xtensa: Consistenly use SIGBUS in do_unaligned_user
  signal/um: Use force_sig_fault where appropriate
  signal/sparc: Use force_sig_fault where appropriate
  signal/sparc: Use send_sig_fault where appropriate
  signal/sh: Use force_sig_fault where appropriate
  signal/s390: Use force_sig_fault where appropriate
  signal/riscv: Replace do_trap_siginfo with force_sig_fault
  signal/riscv: Use force_sig_fault where appropriate
  signal/parisc: Use force_sig_fault where appropriate
  signal/parisc: Use force_sig_mceerr where appropriate
  signal/openrisc: Use force_sig_fault where appropriate
  signal/nios2: Use force_sig_fault where appropriate
  ...
parents d8aed841 26da3501

arch/alpha/include/uapi/asm/siginfo.h

+0 −14
Original line number Diff line number Diff line
@@ -7,18 +7,4 @@ 


#include <asm-generic/siginfo.h>



/*

 * SIGFPE si_codes

 */

#ifdef __KERNEL__

#define FPE_FIXME	0	/* Broken dup of SI_USER */

#endif /* __KERNEL__ */



/*

 * SIGTRAP si_codes

 */

#ifdef __KERNEL__

#define TRAP_FIXME	0	/* Broken dup of SI_USER */

#endif /* __KERNEL__ */



#endif

arch/alpha/kernel/osf_sys.c

+4 −7
Original line number Diff line number Diff line
@@ -871,8 +871,7 @@ SYSCALL_DEFINE5(osf_setsysinfo, unsigned long, op, void __user *, buffer, 
		   send a signal.  Old exceptions are not signaled.  */

		fex = (exc >> IEEE_STATUS_TO_EXCSUM_SHIFT) & swcr;

 		if (fex) {

			siginfo_t info;

			int si_code = 0;

			int si_code = FPE_FLTUNK;



			if (fex & IEEE_TRAP_ENABLE_DNO) si_code = FPE_FLTUND;

			if (fex & IEEE_TRAP_ENABLE_INE) si_code = FPE_FLTRES;
@@ -881,11 +880,9 @@ SYSCALL_DEFINE5(osf_setsysinfo, unsigned long, op, void __user *, buffer, 
			if (fex & IEEE_TRAP_ENABLE_DZE) si_code = FPE_FLTDIV;

			if (fex & IEEE_TRAP_ENABLE_INV) si_code = FPE_FLTINV;



			info.si_signo = SIGFPE;

			info.si_errno = 0;

			info.si_code = si_code;

			info.si_addr = NULL;  /* FIXME */

 			send_sig_info(SIGFPE, &info, current);

			send_sig_fault(SIGFPE, si_code,

				       (void __user *)NULL,  /* FIXME */

				       0, current);

 		}

		return 0;

	}

arch/alpha/kernel/signal.c

+4 −16
Original line number Diff line number Diff line
@@ -219,14 +219,8 @@ do_sigreturn(struct sigcontext __user *sc) 


	/* Send SIGTRAP if we're single-stepping: */

	if (ptrace_cancel_bpt (current)) {

		siginfo_t info;



		info.si_signo = SIGTRAP;

		info.si_errno = 0;

		info.si_code = TRAP_BRKPT;

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

		info.si_trapno = 0;

		send_sig_info(SIGTRAP, &info, current);

		send_sig_fault(SIGTRAP, TRAP_BRKPT, (void __user *) regs->pc, 0,

			       current);

	}

	return;
@@ -253,14 +247,8 @@ do_rt_sigreturn(struct rt_sigframe __user *frame) 


	/* Send SIGTRAP if we're single-stepping: */

	if (ptrace_cancel_bpt (current)) {

		siginfo_t info;



		info.si_signo = SIGTRAP;

		info.si_errno = 0;

		info.si_code = TRAP_BRKPT;

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

		info.si_trapno = 0;

		send_sig_info(SIGTRAP, &info, current);

		send_sig_fault(SIGTRAP, TRAP_BRKPT, (void __user *) regs->pc, 0,

			       current);

	}

	return;

arch/alpha/kernel/traps.c

+20 −59
Original line number Diff line number Diff line
@@ -213,7 +213,6 @@ do_entArith(unsigned long summary, unsigned long write_mask, 
	    struct pt_regs *regs)

{

	long si_code = FPE_FLTINV;

	siginfo_t info;



	if (summary & 1) {

		/* Software-completion summary bit is set, so try to
@@ -228,17 +227,12 @@ do_entArith(unsigned long summary, unsigned long write_mask, 
	}

	die_if_kernel("Arithmetic fault", regs, 0, NULL);



	info.si_signo = SIGFPE;

	info.si_errno = 0;

	info.si_code = si_code;

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

	send_sig_info(SIGFPE, &info, current);

	send_sig_fault(SIGFPE, si_code, (void __user *) regs->pc, 0, current);

}



asmlinkage void

do_entIF(unsigned long type, struct pt_regs *regs)

{

	siginfo_t info;

	int signo, code;



	if ((regs->ps & ~IPL_MAX) == 0) {
@@ -270,31 +264,20 @@ do_entIF(unsigned long type, struct pt_regs *regs) 


	switch (type) {

	      case 0: /* breakpoint */

		info.si_signo = SIGTRAP;

		info.si_errno = 0;

		info.si_code = TRAP_BRKPT;

		info.si_trapno = 0;

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



		if (ptrace_cancel_bpt(current)) {

			regs->pc -= 4;	/* make pc point to former bpt */

		}



		send_sig_info(SIGTRAP, &info, current);

		send_sig_fault(SIGTRAP, TRAP_BRKPT, (void __user *)regs->pc, 0,

			       current);

		return;



	      case 1: /* bugcheck */

		info.si_signo = SIGTRAP;

		info.si_errno = 0;

		info.si_code = TRAP_FIXME;

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

		info.si_trapno = 0;

		send_sig_info(SIGTRAP, &info, current);

		send_sig_fault(SIGTRAP, TRAP_UNK, (void __user *) regs->pc, 0,

			       current);

		return;

		

	      case 2: /* gentrap */

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

		info.si_trapno = regs->r16;

		switch ((long) regs->r16) {

		case GEN_INTOVF:

			signo = SIGFPE;
@@ -326,7 +309,7 @@ do_entIF(unsigned long type, struct pt_regs *regs) 
			break;

		case GEN_ROPRAND:

			signo = SIGFPE;

			code = FPE_FIXME;

			code = FPE_FLTUNK;

			break;



		case GEN_DECOVF:
@@ -348,15 +331,12 @@ do_entIF(unsigned long type, struct pt_regs *regs) 
		case GEN_SUBRNG7:

		default:

			signo = SIGTRAP;

			code = TRAP_FIXME;

			code = TRAP_UNK;

			break;

		}



		info.si_signo = signo;

		info.si_errno = 0;

		info.si_code = code;

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

		send_sig_info(signo, &info, current);

		send_sig_fault(signo, code, (void __user *) regs->pc, regs->r16,

			       current);

		return;



	      case 4: /* opDEC */
@@ -380,11 +360,9 @@ do_entIF(unsigned long type, struct pt_regs *regs) 
			if (si_code == 0)

				return;

			if (si_code > 0) {

				info.si_signo = SIGFPE;

				info.si_errno = 0;

				info.si_code = si_code;

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

				send_sig_info(SIGFPE, &info, current);

				send_sig_fault(SIGFPE, si_code,

					       (void __user *) regs->pc, 0,

					       current);

				return;

			}

		}
@@ -409,11 +387,7 @@ do_entIF(unsigned long type, struct pt_regs *regs) 
		      ;

	}



	info.si_signo = SIGILL;

	info.si_errno = 0;

	info.si_code = ILL_ILLOPC;

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

	send_sig_info(SIGILL, &info, current);

	send_sig_fault(SIGILL, ILL_ILLOPC, (void __user *)regs->pc, 0, current);

}



/* There is an ifdef in the PALcode in MILO that enables a
@@ -426,15 +400,9 @@ do_entIF(unsigned long type, struct pt_regs *regs) 
asmlinkage void

do_entDbg(struct pt_regs *regs)

{

	siginfo_t info;



	die_if_kernel("Instruction fault", regs, 0, NULL);



	info.si_signo = SIGILL;

	info.si_errno = 0;

	info.si_code = ILL_ILLOPC;

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

	force_sig_info(SIGILL, &info, current);

	force_sig_fault(SIGILL, ILL_ILLOPC, (void __user *)regs->pc, 0, current);

}
@@ -758,7 +726,7 @@ do_entUnaUser(void __user * va, unsigned long opcode, 


	unsigned long tmp1, tmp2, tmp3, tmp4;

	unsigned long fake_reg, *reg_addr = &fake_reg;

	siginfo_t info;

	int si_code;

	long error;



	/* Check the UAC bits to decide what the user wants us to do
@@ -981,34 +949,27 @@ do_entUnaUser(void __user * va, unsigned long opcode, 


give_sigsegv:

	regs->pc -= 4;  /* make pc point to faulting insn */

	info.si_signo = SIGSEGV;

	info.si_errno = 0;



	/* We need to replicate some of the logic in mm/fault.c,

	   since we don't have access to the fault code in the

	   exception handling return path.  */

	if ((unsigned long)va >= TASK_SIZE)

		info.si_code = SEGV_ACCERR;

		si_code = SEGV_ACCERR;

	else {

		struct mm_struct *mm = current->mm;

		down_read(&mm->mmap_sem);

		if (find_vma(mm, (unsigned long)va))

			info.si_code = SEGV_ACCERR;

			si_code = SEGV_ACCERR;

		else

			info.si_code = SEGV_MAPERR;

			si_code = SEGV_MAPERR;

		up_read(&mm->mmap_sem);

	}

	info.si_addr = va;

	send_sig_info(SIGSEGV, &info, current);

	send_sig_fault(SIGSEGV, si_code, va, 0, current);

	return;



give_sigbus:

	regs->pc -= 4;

	info.si_signo = SIGBUS;

	info.si_errno = 0;

	info.si_code = BUS_ADRALN;

	info.si_addr = va;

	send_sig_info(SIGBUS, &info, current);

	send_sig_fault(SIGBUS, BUS_ADRALN, va, 0, current);

	return;

}

arch/alpha/mm/fault.c

+2 −11
Original line number Diff line number Diff line
@@ -88,7 +88,6 @@ do_page_fault(unsigned long address, unsigned long mmcsr, 
	struct mm_struct *mm = current->mm;

	const struct exception_table_entry *fixup;

	int fault, si_code = SEGV_MAPERR;

	siginfo_t info;

	unsigned int flags = FAULT_FLAG_ALLOW_RETRY | FAULT_FLAG_KILLABLE;



	/* As of EV6, a load into $31/$f31 is a prefetch, and never faults
@@ -221,21 +220,13 @@ retry: 
	up_read(&mm->mmap_sem);

	/* Send a sigbus, regardless of whether we were in kernel

	   or user mode.  */

	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, 0, current);

	if (!user_mode(regs))

		goto no_context;

	return;



 do_sigsegv:

	info.si_signo = SIGSEGV;

	info.si_errno = 0;

	info.si_code = si_code;

	info.si_addr = (void __user *) address;

	force_sig_info(SIGSEGV, &info, current);

	force_sig_fault(SIGSEGV, si_code, (void __user *) address, 0, current);

	return;



#ifdef CONFIG_ALPHA_LARGE_VMALLOC

CRA Git | Maintained and supported by SUSTech CRA and CCSE