From: Anton Ivanov <anton.ivanov@kot-begemot.co.uk> To: "Eric W. Biederman" <ebiederm@xmission.com>, linux-arch@vger.kernel.org Cc: Richard Weinberger <richard@nod.at>, Jeff Dike <jdike@addtoit.com>, linux-kernel@vger.kernel.org, linux-um@lists.infradead.org, "user-mode-linux-devel@lists.sourceforge.net" <user-mode-linux-devel@lists.sourceforge.net> Subject: Re: [uml-devel] [REVIEW][PATCH 19/22] signal/um: Use force_sig_fault in relay_signal. Date: Fri, 20 Apr 2018 17:06:10 +0100 [thread overview] Message-ID: <7074fe36-27c5-ee82-9659-da703cfc91fe@kot-begemot.co.uk> (raw) In-Reply-To: <20180420143811.9994-19-ebiederm@xmission.com> On 04/20/18 15:38, Eric W. Biederman wrote: > Today user mode linux only works on x86 and x86_64 and this allows > simplifications of relay_signal. I believe someone recently fixed the ARM port. I have not had the time to try the fixes though. I have added the new list we are migrating to the cc list. A. > > - x86 always set si_errno to 0 in fault handlers. > - x86 does not implement si_trapno. > - Only si_codes between SI_USER and SI_KERNEL have a fault address. > > Therefore warn if si_errno is set (it should never be). > Use force_sig_info in the case where we know we have a good fault. > > For signals whose content it is not clear how to relay use plain > force_sig and let the signal sending code come up with an > appropriate generic siginfo. > > Cc: Jeff Dike <jdike@addtoit.com> > Cc: Richard Weinberger <richard@nod.at> > Cc: user-mode-linux-devel@lists.sourceforge.net > Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com> > --- > arch/um/kernel/trap.c | 28 +++++++++++++--------------- > 1 file changed, 13 insertions(+), 15 deletions(-) > > diff --git a/arch/um/kernel/trap.c b/arch/um/kernel/trap.c > index d4d38520c4c6..5f0ff17cd790 100644 > --- a/arch/um/kernel/trap.c > +++ b/arch/um/kernel/trap.c > @@ -296,9 +296,6 @@ unsigned long segv(struct faultinfo fi, unsigned long ip, int is_user, > > void relay_signal(int sig, struct siginfo *si, struct uml_pt_regs *regs) > { > - struct faultinfo *fi; > - struct siginfo clean_si; > - > if (!UPT_IS_USER(regs)) { > if (sig == SIGBUS) > printk(KERN_ERR "Bus error - the host /dev/shm or /tmp " > @@ -308,29 +305,30 @@ void relay_signal(int sig, struct siginfo *si, struct uml_pt_regs *regs) > > arch_examine_signal(sig, regs); > > - clear_siginfo(&clean_si); > - clean_si.si_signo = si->si_signo; > - clean_si.si_errno = si->si_errno; > - clean_si.si_code = si->si_code; > + if (unlikely(si->si_errno)) { > + printk(KERN_ERR "Attempted to relay signal %d (si_code = %d) with errno %d\n", > + sig, si->si_code, si->si_errno); > + } > switch (sig) { > case SIGILL: > case SIGFPE: > case SIGSEGV: > case SIGBUS: > case SIGTRAP: > - fi = UPT_FAULTINFO(regs); > - clean_si.si_addr = (void __user *) FAULT_ADDRESS(*fi); > - current->thread.arch.faultinfo = *fi; > -#ifdef __ARCH_SI_TRAPNO > - clean_si.si_trapno = si->si_trapno; > -#endif > - break; > + if ((si->si_code > SI_USER) && (si->si_code < SI_KERNEL)) { > + struct faultinfo *fi = UPT_FAULTINFO(regs); > + current->thread.arch.faultinfo = *fi; > + force_sig_fault(sig, si->si_code, > + (void __user *)FAULT_ADDRESS(*fi), > + current); > + break; > + } > default: > printk(KERN_ERR "Attempted to relay unknown signal %d (si_code = %d)\n", > sig, si->si_code); > } > > - force_sig_info(sig, &clean_si, current); > + force_sig(sig, current); > } > > void bus_handler(int sig, struct siginfo *si, struct uml_pt_regs *regs)
WARNING: multiple messages have this Message-ID (diff)
From: Anton Ivanov <anton.ivanov@kot-begemot.co.uk> To: "Eric W. Biederman" <ebiederm@xmission.com>, linux-arch@vger.kernel.org Cc: Richard Weinberger <richard@nod.at>, Jeff Dike <jdike@addtoit.com>, linux-um@lists.infradead.org, linux-kernel@vger.kernel.org, "user-mode-linux-devel@lists.sourceforge.net" <user-mode-linux-devel@lists.sourceforge.net> Subject: Re: [uml-devel] [REVIEW][PATCH 19/22] signal/um: Use force_sig_fault in relay_signal. Date: Fri, 20 Apr 2018 17:06:10 +0100 [thread overview] Message-ID: <7074fe36-27c5-ee82-9659-da703cfc91fe@kot-begemot.co.uk> (raw) In-Reply-To: <20180420143811.9994-19-ebiederm@xmission.com> On 04/20/18 15:38, Eric W. Biederman wrote: > Today user mode linux only works on x86 and x86_64 and this allows > simplifications of relay_signal. I believe someone recently fixed the ARM port. I have not had the time to try the fixes though. I have added the new list we are migrating to the cc list. A. > > - x86 always set si_errno to 0 in fault handlers. > - x86 does not implement si_trapno. > - Only si_codes between SI_USER and SI_KERNEL have a fault address. > > Therefore warn if si_errno is set (it should never be). > Use force_sig_info in the case where we know we have a good fault. > > For signals whose content it is not clear how to relay use plain > force_sig and let the signal sending code come up with an > appropriate generic siginfo. > > Cc: Jeff Dike <jdike@addtoit.com> > Cc: Richard Weinberger <richard@nod.at> > Cc: user-mode-linux-devel@lists.sourceforge.net > Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com> > --- > arch/um/kernel/trap.c | 28 +++++++++++++--------------- > 1 file changed, 13 insertions(+), 15 deletions(-) > > diff --git a/arch/um/kernel/trap.c b/arch/um/kernel/trap.c > index d4d38520c4c6..5f0ff17cd790 100644 > --- a/arch/um/kernel/trap.c > +++ b/arch/um/kernel/trap.c > @@ -296,9 +296,6 @@ unsigned long segv(struct faultinfo fi, unsigned long ip, int is_user, > > void relay_signal(int sig, struct siginfo *si, struct uml_pt_regs *regs) > { > - struct faultinfo *fi; > - struct siginfo clean_si; > - > if (!UPT_IS_USER(regs)) { > if (sig == SIGBUS) > printk(KERN_ERR "Bus error - the host /dev/shm or /tmp " > @@ -308,29 +305,30 @@ void relay_signal(int sig, struct siginfo *si, struct uml_pt_regs *regs) > > arch_examine_signal(sig, regs); > > - clear_siginfo(&clean_si); > - clean_si.si_signo = si->si_signo; > - clean_si.si_errno = si->si_errno; > - clean_si.si_code = si->si_code; > + if (unlikely(si->si_errno)) { > + printk(KERN_ERR "Attempted to relay signal %d (si_code = %d) with errno %d\n", > + sig, si->si_code, si->si_errno); > + } > switch (sig) { > case SIGILL: > case SIGFPE: > case SIGSEGV: > case SIGBUS: > case SIGTRAP: > - fi = UPT_FAULTINFO(regs); > - clean_si.si_addr = (void __user *) FAULT_ADDRESS(*fi); > - current->thread.arch.faultinfo = *fi; > -#ifdef __ARCH_SI_TRAPNO > - clean_si.si_trapno = si->si_trapno; > -#endif > - break; > + if ((si->si_code > SI_USER) && (si->si_code < SI_KERNEL)) { > + struct faultinfo *fi = UPT_FAULTINFO(regs); > + current->thread.arch.faultinfo = *fi; > + force_sig_fault(sig, si->si_code, > + (void __user *)FAULT_ADDRESS(*fi), > + current); > + break; > + } > default: > printk(KERN_ERR "Attempted to relay unknown signal %d (si_code = %d)\n", > sig, si->si_code); > } > > - force_sig_info(sig, &clean_si, current); > + force_sig(sig, current); > } > > void bus_handler(int sig, struct siginfo *si, struct uml_pt_regs *regs) ------------------------------------------------------------------------------ Check out the vibrant tech community on one of the world's most engaging tech sites, Slashdot.org! http://sdm.link/slashdot _______________________________________________ User-mode-linux-devel mailing list User-mode-linux-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/user-mode-linux-devel
next prev parent reply other threads:[~2018-04-20 16:06 UTC|newest] Thread overview: 113+ messages / expand[flat|nested] mbox.gz Atom feed top 2018-04-20 1:01 [REVIEW][PATCH 00/17] siginfo bugfixes and cleanups Eric W. Biederman 2018-04-20 1:01 ` Eric W. Biederman 2018-04-20 1:03 ` [REVIEW][PATCH 01/17] signal/alpha: Document a conflict with SI_USER for SIGFPE Eric W. Biederman 2018-04-20 1:03 ` [REVIEW][PATCH 02/17] sparc: fix compat siginfo ABI regression Eric W. Biederman 2018-04-20 1:03 ` Eric W. Biederman 2018-04-20 1:03 ` [REVIEW][PATCH 03/17] signal/sh: Use force_sig_fault in hw_breakpoint_handler Eric W. Biederman 2018-04-20 1:03 ` Eric W. Biederman 2018-04-20 1:03 ` [REVIEW][PATCH 04/17] signal/nds32: Use force_sig in unhandled_interruption and unhandled_exceptions Eric W. Biederman 2018-04-25 12:14 ` Vincent Chen 2018-04-20 1:03 ` [REVIEW][PATCH 05/17] signal/nds32: Use force_sig(SIGILL) in do_revisn Eric W. Biederman 2018-04-25 12:10 ` Vincent Chen 2018-04-25 16:13 ` [PATCH] signal/nds32: More information in do_revinsn Eric W. Biederman 2018-04-26 3:02 ` Vincent Chen 2018-04-20 1:03 ` [REVIEW][PATCH 06/17] signal: Ensure every siginfo we send has all bits initialized Eric W. Biederman 2018-04-20 1:03 ` [REVIEW][PATCH 07/17] signal: Reduce copy_siginfo_to_user to just copy_to_user Eric W. Biederman 2018-04-20 1:03 ` [REVIEW][PATCH 08/17] signal: Stop special casing TRAP_FIXME and FPE_FIXME in siginfo_layout Eric W. Biederman 2018-04-20 1:04 ` [REVIEW][PATCH 09/17] signal: Remove SEGV_BNDERR ifdefs Eric W. Biederman 2018-04-20 1:04 ` [REVIEW][PATCH 10/17] signal: Remove ifdefs for BUS_MCEERR_AR and BUS_MCEERR_AO Eric W. Biederman 2018-04-20 1:04 ` [REVIEW][PATCH 11/17] signal/alpha: Replace FPE_FIXME with FPE_FLTUNK Eric W. Biederman 2018-04-20 1:04 ` [REVIEW][PATCH 12/17] signal/ia64: " Eric W. Biederman 2018-04-20 1:04 ` Eric W. Biederman 2018-04-20 1:04 ` [REVIEW][PATCH 13/17] signal/powerpc: " Eric W. Biederman 2018-04-20 1:04 ` [REVIEW][PATCH 14/17] signal/unicore32: Use FPE_FLTUNK instead of 0 in ucf64_raise_sigfpe Eric W. Biederman 2018-04-20 1:04 ` [REVIEW][PATCH 15/17] signal: Add TRAP_UNK si_code for undiagnosted trap exceptions Eric W. Biederman 2018-04-20 1:04 ` [REVIEW][PATCH 16/17] signal/alpha: Replace TRAP_FIXME with TRAP_UNK Eric W. Biederman 2018-04-20 1:04 ` [REVIEW][PATCH 17/17] signal/powerpc: " Eric W. Biederman 2018-04-20 14:35 ` [REVIEW][PATCH 00/22] Simplifying siginfo users Eric W. Biederman 2018-04-20 14:35 ` Eric W. Biederman 2018-04-20 14:35 ` [OpenRISC] " Eric W. Biederman 2018-04-20 14:35 ` Eric W. Biederman 2018-04-20 14:35 ` Eric W. Biederman 2018-04-20 14:35 ` Eric W. Biederman 2018-04-20 14:37 ` [REVIEW][PATCH 01/22] signal/alpha: Use send_sig_fault where appropriate Eric W. Biederman 2018-04-20 14:37 ` [REVIEW][PATCH 02/22] signal/alpha: Use force_sig_fault " Eric W. Biederman 2018-04-20 14:37 ` [REVIEW][PATCH 03/22] signal/c6x: " Eric W. Biederman 2018-04-20 14:37 ` [REVIEW][PATCH 04/22] signal/hexagon: Use force_sig_fault as appropriate Eric W. Biederman 2018-04-20 14:37 ` [REVIEW][PATCH 05/22] signal/m68k: Use force_sig_fault where appropriate Eric W. Biederman 2018-04-20 14:37 ` Eric W. Biederman 2018-04-20 14:37 ` [REVIEW][PATCH 06/22] signal/microblaze: Remove the commented out force_sig_info in do_page_fault Eric W. Biederman 2018-04-20 14:37 ` [REVIEW][PATCH 07/22] signal/microblaze: Use force_sig_fault where appropriate Eric W. Biederman 2018-04-20 14:37 ` [REVIEW][PATCH 08/22] signal/mips: " Eric W. Biederman 2018-05-09 15:14 ` Matt Redfearn 2018-05-09 15:14 ` Matt Redfearn 2018-05-10 2:39 ` Eric W. Biederman 2018-05-10 2:39 ` Eric W. Biederman 2018-05-10 7:59 ` Matt Redfearn 2018-05-10 7:59 ` Matt Redfearn 2018-05-11 2:31 ` Eric W. Biederman 2018-05-11 2:31 ` Eric W. Biederman 2018-04-20 14:37 ` [REVIEW][PATCH 09/22] signal/nds32: " Eric W. Biederman 2018-04-25 11:29 ` Vincent Chen 2018-04-25 15:57 ` Eric W. Biederman 2018-04-26 1:24 ` Greentime Hu 2018-04-20 14:37 ` [REVIEW][PATCH 10/22] signal/nios2: " Eric W. Biederman 2018-04-20 14:38 ` [REVIEW][PATCH 11/22] signal/openrisc: " Eric W. Biederman 2018-04-20 14:38 ` [OpenRISC] " Eric W. Biederman 2018-04-20 14:38 ` [REVIEW][PATCH 12/22] signal/parisc: Use force_sig_mceerr " Eric W. Biederman 2018-04-20 14:38 ` [REVIEW][PATCH 13/22] signal/parisc: Use force_sig_fault " Eric W. Biederman 2018-04-21 17:24 ` Helge Deller 2018-04-20 14:38 ` [REVIEW][PATCH 14/22] signal/riscv: " Eric W. Biederman 2018-04-20 14:38 ` Eric W. Biederman 2018-04-21 7:25 ` Christoph Hellwig 2018-04-21 7:25 ` Christoph Hellwig 2018-04-24 15:31 ` [REVIEW][PATCH 23/22] signal/riscv: Replace do_trap_siginfo with force_sig_fault Eric W. Biederman 2018-04-24 15:31 ` Eric W. Biederman 2018-04-23 19:11 ` [REVIEW][PATCH 14/22] signal/riscv: Use force_sig_fault where appropriate Palmer Dabbelt 2018-04-23 19:11 ` Palmer Dabbelt 2018-04-23 19:11 ` Palmer Dabbelt 2018-04-24 15:28 ` Eric W. Biederman 2018-04-24 15:28 ` Eric W. Biederman 2018-04-20 14:38 ` [REVIEW][PATCH 15/22] signal/s390: " Eric W. Biederman 2018-04-23 5:44 ` Martin Schwidefsky 2018-04-20 14:38 ` [REVIEW][PATCH 16/22] signal/sh: " Eric W. Biederman 2018-04-20 14:38 ` Eric W. Biederman 2018-04-20 14:55 ` Rich Felker 2018-04-20 14:55 ` Rich Felker 2018-05-28 9:19 ` Geert Uytterhoeven 2018-05-28 9:19 ` Geert Uytterhoeven 2018-05-29 15:00 ` [PATCH] signal/sh: Stop gcc warning about an impossible case in do_divide_error Eric W. Biederman 2018-05-29 15:00 ` Eric W. Biederman 2018-05-30 7:54 ` Sergei Shtylyov 2018-05-30 7:54 ` Sergei Shtylyov 2018-04-20 14:38 ` [REVIEW][PATCH 17/22] signal/sparc: Use send_sig_fault where appropriate Eric W. Biederman 2018-04-20 14:38 ` Eric W. Biederman 2018-04-20 14:38 ` [REVIEW][PATCH 18/22] signal/sparc: Use force_sig_fault " Eric W. Biederman 2018-04-20 14:38 ` Eric W. Biederman 2018-04-20 14:38 ` [REVIEW][PATCH 19/22] signal/um: Use force_sig_fault in relay_signal Eric W. Biederman 2018-04-20 16:06 ` Anton Ivanov [this message] 2018-04-20 16:06 ` [uml-devel] " Anton Ivanov 2018-04-24 8:32 ` Richard Weinberger 2018-04-24 8:32 ` Richard Weinberger 2018-04-24 8:44 ` Anton Ivanov 2018-04-24 8:44 ` Anton Ivanov 2018-04-24 15:59 ` Eric W. Biederman 2018-04-24 15:59 ` Eric W. Biederman [not found] ` <CAMD8JhwgcWCp6c=O4-spNW1VdY5M-eAjr7M5PieeAfeTSe_4yw@mail.gmail.com> 2018-04-24 22:03 ` Martin Pärtel 2018-04-24 22:03 ` Martin Pärtel 2018-04-24 22:24 ` Eric W. Biederman 2018-04-24 22:24 ` Eric W. Biederman 2018-04-24 22:24 ` Eric W. Biederman 2018-04-25 23:05 ` Martin Pärtel 2018-04-28 14:02 ` [REVIEW][PATCH 0/5] Improving siginfo_layout and fixing uml's relay_signal Eric W. Biederman 2018-04-28 14:02 ` [uml-devel] " Eric W. Biederman 2018-04-28 14:06 ` [REVIEW][PATCH 1/5] signal/signalfd: Remove __put_user from signalfd_copyinfo Eric W. Biederman 2018-04-28 14:06 ` [REVIEW][PATCH 2/5] signal/signalfd: Add support for SIGSYS Eric W. Biederman 2018-04-28 14:07 ` [REVIEW][PATCH 3/5] signal: Remove unncessary #ifdef SEGV_PKUERR in 32bit compat code Eric W. Biederman 2018-04-28 14:07 ` [REVIEW][PATCH 4/5] signal: Extend siginfo_layout with SIL_FAULT_{MCEERR|BNDERR|PKUERR} Eric W. Biederman 2018-04-28 14:07 ` [REVIEW][PATCH 5/5] signal/um: More carefully relay signals in relay_signal Eric W. Biederman 2018-04-20 14:38 ` [REVIEW][PATCH 20/22] signal/um: Use force_sig_fault where appropriate Eric W. Biederman 2018-04-20 14:38 ` [REVIEW][PATCH 21/22] signal/xtensa: Consistenly use SIGBUS in do_unaligned_user Eric W. Biederman 2018-04-20 16:06 ` Max Filippov 2018-04-20 14:38 ` [REVIEW][PATCH 22/22] signal/xtensa: Use force_sig_fault where appropriate Eric W. Biederman 2018-04-20 16:27 ` Max Filippov
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=7074fe36-27c5-ee82-9659-da703cfc91fe@kot-begemot.co.uk \ --to=anton.ivanov@kot-begemot.co.uk \ --cc=ebiederm@xmission.com \ --cc=jdike@addtoit.com \ --cc=linux-arch@vger.kernel.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-um@lists.infradead.org \ --cc=richard@nod.at \ --cc=user-mode-linux-devel@lists.sourceforge.net \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.