Commit 48983701 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'siginfo-si_trapno-for-v5.15' of... 

Merge branch 'siginfo-si_trapno-for-v5.15' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace

Pull siginfo si_trapno updates from Eric Biederman:
 "The full set of si_trapno changes was not appropriate as a fix for the
  newly added SIGTRAP TRAP_PERF, and so I postponed the rest of the
  related cleanups.

  This is the rest of the cleanups for si_trapno that reduces it from
  being a really weird arch special case that is expect to be always
  present (but isn't) on the architectures that support it to being yet
  another field in the _sigfault union of struct siginfo.

  The changes have been reviewed and marinated in linux-next. With the
  removal of this awkward special case new code (like SIGTRAP TRAP_PERF)
  that works across architectures should be easier to write and
  maintain"

* 'siginfo-si_trapno-for-v5.15' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace:
  signal: Rename SIL_PERF_EVENT SIL_FAULT_PERF_EVENT for consistency
  signal: Verify the alignment and size of siginfo_t
  signal: Remove the generic __ARCH_SI_TRAPNO support
  signal/alpha: si_trapno is only used with SIGFPE and SIGTRAP TRAP_UNK
  signal/sparc: si_trapno is only used with SIGILL ILL_ILLTRP
  arm64: Add compile-time asserts for siginfo_t offsets
  arm: Add compile-time asserts for siginfo_t offsets
  sparc64: Add compile-time asserts for siginfo_t offsets
parents 477f70cd ee53488c

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

+0 −2
Original line number Diff line number Diff line
@@ -2,8 +2,6 @@ 
#ifndef _ALPHA_SIGINFO_H

#define _ALPHA_SIGINFO_H



#define __ARCH_SI_TRAPNO



#include <asm-generic/siginfo.h>



#endif

arch/alpha/kernel/osf_sys.c

+1 −1
Original line number Diff line number Diff line
@@ -876,7 +876,7 @@ 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;



			send_sig_fault(SIGFPE, si_code,

			send_sig_fault_trapno(SIGFPE, si_code,

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

				       0, current);

 		}

arch/alpha/kernel/signal.c

+2 −2
Original line number Diff line number Diff line
@@ -219,7 +219,7 @@ do_sigreturn(struct sigcontext __user *sc) 


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

	if (ptrace_cancel_bpt (current)) {

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

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

			       current);

	}

	return;
@@ -247,7 +247,7 @@ do_rt_sigreturn(struct rt_sigframe __user *frame) 


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

	if (ptrace_cancel_bpt (current)) {

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

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

			       current);

	}

	return;

arch/alpha/kernel/traps.c

+13 −13
Original line number Diff line number Diff line
@@ -227,7 +227,7 @@ do_entArith(unsigned long summary, unsigned long write_mask, 
	}

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



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

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

}



asmlinkage void
@@ -268,13 +268,13 @@ do_entIF(unsigned long type, struct pt_regs *regs) 
			regs->pc -= 4;	/* make pc point to former bpt */

		}



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

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

			       current);

		return;



	      case 1: /* bugcheck */

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

			       current);

		send_sig_fault_trapno(SIGTRAP, TRAP_UNK,

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

		return;

		

	      case 2: /* gentrap */
@@ -335,8 +335,8 @@ do_entIF(unsigned long type, struct pt_regs *regs) 
			break;

		}



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

			       current);

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

				      regs->r16, current);

		return;



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

				return;

			if (si_code > 0) {

				send_sig_fault(SIGFPE, si_code,

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

					       current);

				send_sig_fault_trapno(SIGFPE, si_code,

						      (void __user *) regs->pc,

						      0, current);

				return;

			}

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

	}



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

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

}



/* There is an ifdef in the PALcode in MILO that enables a
@@ -402,7 +402,7 @@ do_entDbg(struct pt_regs *regs) 
{

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



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

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

}
@@ -964,12 +964,12 @@ do_entUnaUser(void __user * va, unsigned long opcode, 
			si_code = SEGV_MAPERR;

		mmap_read_unlock(mm);

	}

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

	send_sig_fault(SIGSEGV, si_code, va, current);

	return;



give_sigbus:

	regs->pc -= 4;

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

	send_sig_fault(SIGBUS, BUS_ADRALN, va, current);

	return;

}

arch/alpha/mm/fault.c

+2 −2
Original line number Diff line number Diff line
@@ -219,13 +219,13 @@ do_page_fault(unsigned long address, unsigned long mmcsr, 
	mmap_read_unlock(mm);

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

	   or user mode.  */

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

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

	if (!user_mode(regs))

		goto no_context;

	return;



 do_sigsegv:

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

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

	return;



#ifdef CONFIG_ALPHA_LARGE_VMALLOC