diff for duplicates of <1500476300.22834.13.camel@nxp.com> diff --git a/a/1.txt b/N1/1.txt index c85bf1d..3f6ca6c 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -1,7 +1,7 @@ On Tue, 2017-07-18 at 12:04 -0700, Thomas Garnier wrote: -> On Tue, Jul 18, 2017 at 10:18 AM, Leonard Crestez <leonard.crestez@nxp.com> wrote: +> On Tue, Jul 18, 2017 at 10:18 AM, Leonard Crestez <leonard.crestez-3arQi8VN3Tc@public.gmane.org> wrote: > > On Tue, 2017-07-18 at 09:04 -0700, Thomas Garnier wrote: -> > > On Tue, Jul 18, 2017 at 7:36 AM, Leonard Crestez <leonard.crestez@nxp.com> wrote: +> > > On Tue, Jul 18, 2017 at 7:36 AM, Leonard Crestez <leonard.crestez-3arQi8VN3Tc@public.gmane.org> wrote: > > > > On Wed, 2017-06-14 at 18:12 -0700, Thomas Garnier wrote: > > > > > > > > > > Ensure the address limit is a user-mode segment before returning to diff --git a/a/content_digest b/N1/content_digest index c4cee5e..831f6d2 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -4,46 +4,40 @@ "ref\0CAJcbSZEr8HPBwH1oVaHqPzAY4MS_=yqMoqPhcauuKu3cikB3uQ@mail.gmail.com\0" "ref\01500398311.12096.30.camel@nxp.com\0" "ref\0CAJcbSZFr9KJTfGfiZo2fThoDkAE-D1OFf2YtELq4P6jX8syesQ@mail.gmail.com\0" - "From\0Leonard Crestez <leonard.crestez@nxp.com>\0" - "Subject\0[kernel-hardening] Re: [PATCH v10 2/3] arm/syscalls: Check address limit on user-mode return\0" + "ref\0CAJcbSZFr9KJTfGfiZo2fThoDkAE-D1OFf2YtELq4P6jX8syesQ-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org\0" + "From\0Leonard Crestez <leonard.crestez-3arQi8VN3Tc@public.gmane.org>\0" + "Subject\0Re: [PATCH v10 2/3] arm/syscalls: Check address limit on user-mode return\0" "Date\0Wed, 19 Jul 2017 17:58:20 +0300\0" - "To\0Thomas Garnier <thgarnie@google.com>" - Thomas Gleixner <tglx@linutronix.de> - " Stephen Rothwell <sfr@canb.auug.org.au>\0" - "Cc\0Ingo Molnar <mingo@redhat.com>" - H . Peter Anvin <hpa@zytor.com> - Andy Lutomirski <luto@kernel.org> - Paolo Bonzini <pbonzini@redhat.com> - Rik van Riel <riel@redhat.com> - Oleg Nesterov <oleg@redhat.com> - Josh Poimboeuf <jpoimboe@redhat.com> - Petr Mladek <pmladek@suse.com> - Miroslav Benes <mbenes@suse.cz> - Kees Cook <keescook@chromium.org> - Al Viro <viro@zeniv.linux.org.uk> - Arnd Bergmann <arnd@arndb.de> - Dave Hansen <dave.hansen@intel.com> - David Howells <dhowells@redhat.com> - Russell King <linux@armlinux.org.uk> - Andy Lutomirski <luto@amacapital.net> - Will Drewry <wad@chromium.org> - Will Deacon <will.deacon@arm.com> - Catalin Marinas <catalin.marinas@arm.com> - Mark Rutland <mark.rutland@arm.com> - Pratyush Anand <panand@redhat.com> - Chris Metcalf <cmetcalf@mellanox.com> - Linux API <linux-api@vger.kernel.org> - the arch/x86 maintainers <x86@kernel.org> - LKML <linux-kernel@vger.kernel.org> - linux-arm-kernel@lists.infradead.org - Kernel Hardening <kernel-hardening@lists.openwall.com> - " Octavian Purdila <octavian.purdila@nxp.com>\0" + "To\0Thomas Garnier <thgarnie-hpIqsD4AKlfQT0dZR+AlfA@public.gmane.org>" + Thomas Gleixner <tglx-hfZtesqFncYOwBW4kG4KsQ@public.gmane.org> + " Stephen Rothwell <sfr-3FnU+UHB4dNDw9hX6IcOSA@public.gmane.org>\0" + "Cc\0Ingo Molnar <mingo-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>" + H . Peter Anvin <hpa-YMNOUZJC4hwAvxtiuMwx3w@public.gmane.org> + Andy Lutomirski <luto-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org> + Paolo Bonzini <pbonzini-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org> + Rik van Riel <riel-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org> + Oleg Nesterov <oleg-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org> + Josh Poimboeuf <jpoimboe-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org> + Petr Mladek <pmladek-IBi9RG/b67k@public.gmane.org> + Miroslav Benes <mbenes-AlSwsSmVLrQ@public.gmane.org> + Kees Cook <keescook-F7+t8E8rja9g9hUCZPvPmw@public.gmane.org> + Al Viro <viro-RmSDqhL/yNMiFSDQTTA3OLVCufUGDwFn@public.gmane.org> + Arnd Bergmann <arnd-r2nGTMty4D4@public.gmane.org> + Dave Hansen <dave.hansen-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org> + David Howells <dhowells-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org> + Russell King <linux-I+IVW8TIWO2tmTQ+vhA3Yw@public.gmane.org> + Andy Lutomirski <luto-kltTT9wpgjJwATOyAt5JVQ@public.gmane.org> + Will Drewry <wad-F7+t8E8rja9g9hUCZPvPmw@public.gmane.org> + Will Deacon <will.deacon-5wv7dgnIgG8@public.gmane.org> + Catalin Marinas <catalin.marinas-5wv7dgnIgG8@public.gmane.org> + Mark Rutland <mark.rutland-5wv7dgnIgG8@public.gmane.org> + " Pratyush Anand <panand-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>\0" "\00:1\0" "b\0" "On Tue, 2017-07-18 at 12:04 -0700, Thomas Garnier wrote:\n" - "> On Tue, Jul 18, 2017 at 10:18 AM, Leonard Crestez <leonard.crestez@nxp.com> wrote:\n" + "> On Tue, Jul 18, 2017 at 10:18 AM, Leonard Crestez <leonard.crestez-3arQi8VN3Tc@public.gmane.org> wrote:\n" "> > On Tue, 2017-07-18 at 09:04 -0700, Thomas Garnier wrote:\n" - "> > > On Tue, Jul 18, 2017 at 7:36 AM, Leonard Crestez <leonard.crestez@nxp.com> wrote:\n" + "> > > On Tue, Jul 18, 2017 at 7:36 AM, Leonard Crestez <leonard.crestez-3arQi8VN3Tc@public.gmane.org> wrote:\n" "> > > > On Wed, 2017-06-14 at 18:12 -0700, Thomas Garnier wrote:\n" "> > > > > \n" "> > > > > Ensure the address limit is a user-mode segment before returning to\n" @@ -144,4 +138,4 @@ "Regards,\n" Leonard -f9630d17626237b3add8e181520f7ca102536cbe61bf083cbdd928afa7f6cdda +65856cad31f63ee7561bf1510c6e1b0d56724e4bf7db9b51a6a1e477010d7809
diff --git a/a/1.txt b/N2/1.txt index c85bf1d..e7dc57b 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -17,16 +17,16 @@ On Tue, 2017-07-18 at 12:04 -0700, Thomas Garnier wrote: > > > > > to used on a single instruction so adapt ret_fast_syscall. > > > > > > > > > > @@ -571,6 +572,10 @@ do_work_pending(struct pt_regs *regs, unsigned int thread_flags, int syscall) -> > > > > * Update the trace code with the current status. -> > > > > */ -> > > > > trace_hardirqs_off(); +> > > > > ???????* Update the trace code with the current status. +> > > > > ???????*/ +> > > > > ??????trace_hardirqs_off(); > > > > > + -> > > > > + /* Check valid user FS if needed */ -> > > > > + addr_limit_user_check(); +> > > > > +?????/* Check valid user FS if needed */ +> > > > > +?????addr_limit_user_check(); > > > > > + -> > > > > do { -> > > > > if (likely(thread_flags & _TIF_NEED_RESCHED)) { -> > > > > schedule(); +> > > > > ??????do { +> > > > > ??????????????if (likely(thread_flags & _TIF_NEED_RESCHED)) { +> > > > > ??????????????????????schedule(); > > > > This patch made it's way into linux-next next-20170717 and it seems to > > > > cause hangs when booting some boards over NFS (found via bisection). I > > > > don't know exactly what determines the issue but I can reproduce hangs @@ -53,20 +53,20 @@ On Tue, 2017-07-18 at 12:04 -0700, Thomas Garnier wrote: > > > +++ b/arch/arm/kernel/signal.c > > > @@ -573,12 +573,11 @@ do_work_pending(struct pt_regs *regs, unsigned > > > int thread_flags, int syscall) -> > > */ -> > > trace_hardirqs_off(); +> > > ? */ +> > > ? trace_hardirqs_off(); > > > > > > - /* Check valid user FS if needed */ > > > - addr_limit_user_check(); > > > - -> > > do { -> > > if (likely(thread_flags & _TIF_NEED_RESCHED)) { -> > > schedule(); +> > > ? do { +> > > ? if (likely(thread_flags & _TIF_NEED_RESCHED)) { +> > > ? schedule(); > > > + } else if (thread_flags & _TIF_FSCHECK) { > > > + addr_limit_user_check(); -> > > } else { -> > > if (unlikely(!user_mode(regs))) -> > > return 0; +> > > ? } else { +> > > ? if (unlikely(!user_mode(regs))) +> > > ? return 0; > > This does seem to work, it no longer hangs on boot in my setup. This is > > obviously only a very superficial test. > > diff --git a/a/content_digest b/N2/content_digest index c4cee5e..5823287 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -4,40 +4,10 @@ "ref\0CAJcbSZEr8HPBwH1oVaHqPzAY4MS_=yqMoqPhcauuKu3cikB3uQ@mail.gmail.com\0" "ref\01500398311.12096.30.camel@nxp.com\0" "ref\0CAJcbSZFr9KJTfGfiZo2fThoDkAE-D1OFf2YtELq4P6jX8syesQ@mail.gmail.com\0" - "From\0Leonard Crestez <leonard.crestez@nxp.com>\0" - "Subject\0[kernel-hardening] Re: [PATCH v10 2/3] arm/syscalls: Check address limit on user-mode return\0" + "From\0leonard.crestez@nxp.com (Leonard Crestez)\0" + "Subject\0[PATCH v10 2/3] arm/syscalls: Check address limit on user-mode return\0" "Date\0Wed, 19 Jul 2017 17:58:20 +0300\0" - "To\0Thomas Garnier <thgarnie@google.com>" - Thomas Gleixner <tglx@linutronix.de> - " Stephen Rothwell <sfr@canb.auug.org.au>\0" - "Cc\0Ingo Molnar <mingo@redhat.com>" - H . Peter Anvin <hpa@zytor.com> - Andy Lutomirski <luto@kernel.org> - Paolo Bonzini <pbonzini@redhat.com> - Rik van Riel <riel@redhat.com> - Oleg Nesterov <oleg@redhat.com> - Josh Poimboeuf <jpoimboe@redhat.com> - Petr Mladek <pmladek@suse.com> - Miroslav Benes <mbenes@suse.cz> - Kees Cook <keescook@chromium.org> - Al Viro <viro@zeniv.linux.org.uk> - Arnd Bergmann <arnd@arndb.de> - Dave Hansen <dave.hansen@intel.com> - David Howells <dhowells@redhat.com> - Russell King <linux@armlinux.org.uk> - Andy Lutomirski <luto@amacapital.net> - Will Drewry <wad@chromium.org> - Will Deacon <will.deacon@arm.com> - Catalin Marinas <catalin.marinas@arm.com> - Mark Rutland <mark.rutland@arm.com> - Pratyush Anand <panand@redhat.com> - Chris Metcalf <cmetcalf@mellanox.com> - Linux API <linux-api@vger.kernel.org> - the arch/x86 maintainers <x86@kernel.org> - LKML <linux-kernel@vger.kernel.org> - linux-arm-kernel@lists.infradead.org - Kernel Hardening <kernel-hardening@lists.openwall.com> - " Octavian Purdila <octavian.purdila@nxp.com>\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "On Tue, 2017-07-18 at 12:04 -0700, Thomas Garnier wrote:\n" @@ -59,16 +29,16 @@ "> > > > > to used on a single instruction so adapt ret_fast_syscall.\n" "> > > > > \n" "> > > > > @@ -571,6 +572,10 @@ do_work_pending(struct pt_regs *regs, unsigned int thread_flags, int syscall)\n" - "> > > > > \302\240\302\240\302\240\302\240\302\240\302\240\302\240* Update the trace code with the current status.\n" - "> > > > > \302\240\302\240\302\240\302\240\302\240\302\240\302\240*/\n" - "> > > > > \302\240\302\240\302\240\302\240\302\240\302\240trace_hardirqs_off();\n" + "> > > > > ???????* Update the trace code with the current status.\n" + "> > > > > ???????*/\n" + "> > > > > ??????trace_hardirqs_off();\n" "> > > > > +\n" - "> > > > > +\302\240\302\240\302\240\302\240\302\240/* Check valid user FS if needed */\n" - "> > > > > +\302\240\302\240\302\240\302\240\302\240addr_limit_user_check();\n" + "> > > > > +?????/* Check valid user FS if needed */\n" + "> > > > > +?????addr_limit_user_check();\n" "> > > > > +\n" - "> > > > > \302\240\302\240\302\240\302\240\302\240\302\240do {\n" - "> > > > > \302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240if (likely(thread_flags & _TIF_NEED_RESCHED)) {\n" - "> > > > > \302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240schedule();\n" + "> > > > > ??????do {\n" + "> > > > > ??????????????if (likely(thread_flags & _TIF_NEED_RESCHED)) {\n" + "> > > > > ??????????????????????schedule();\n" "> > > > This patch made it's way into linux-next next-20170717 and it seems to\n" "> > > > cause hangs when booting some boards over NFS (found via bisection). I\n" "> > > > don't know exactly what determines the issue but I can reproduce hangs\n" @@ -95,20 +65,20 @@ "> > > +++ b/arch/arm/kernel/signal.c\n" "> > > @@ -573,12 +573,11 @@ do_work_pending(struct pt_regs *regs, unsigned\n" "> > > int thread_flags, int syscall)\n" - "> > > \302\240 */\n" - "> > > \302\240 trace_hardirqs_off();\n" + "> > > ? */\n" + "> > > ? trace_hardirqs_off();\n" "> > > \n" "> > > - /* Check valid user FS if needed */\n" "> > > - addr_limit_user_check();\n" "> > > -\n" - "> > > \302\240 do {\n" - "> > > \302\240 if (likely(thread_flags & _TIF_NEED_RESCHED)) {\n" - "> > > \302\240 schedule();\n" + "> > > ? do {\n" + "> > > ? if (likely(thread_flags & _TIF_NEED_RESCHED)) {\n" + "> > > ? schedule();\n" "> > > + } else if (thread_flags & _TIF_FSCHECK) {\n" "> > > + addr_limit_user_check();\n" - "> > > \302\240 } else {\n" - "> > > \302\240 if (unlikely(!user_mode(regs)))\n" - "> > > \302\240 return 0;\n" + "> > > ? } else {\n" + "> > > ? if (unlikely(!user_mode(regs)))\n" + "> > > ? return 0;\n" "> > This does seem to work, it no longer hangs on boot in my setup. This is\n" "> > obviously only a very superficial test.\n" "> > \n" @@ -144,4 +114,4 @@ "Regards,\n" Leonard -f9630d17626237b3add8e181520f7ca102536cbe61bf083cbdd928afa7f6cdda +eddec9e256bebfca653ef50a893ea7beb9b0ccc2ff26338f71ff991d5981886c
diff --git a/a/content_digest b/N3/content_digest index c4cee5e..4d473c1 100644 --- a/a/content_digest +++ b/N3/content_digest @@ -5,7 +5,7 @@ "ref\01500398311.12096.30.camel@nxp.com\0" "ref\0CAJcbSZFr9KJTfGfiZo2fThoDkAE-D1OFf2YtELq4P6jX8syesQ@mail.gmail.com\0" "From\0Leonard Crestez <leonard.crestez@nxp.com>\0" - "Subject\0[kernel-hardening] Re: [PATCH v10 2/3] arm/syscalls: Check address limit on user-mode return\0" + "Subject\0Re: [PATCH v10 2/3] arm/syscalls: Check address limit on user-mode return\0" "Date\0Wed, 19 Jul 2017 17:58:20 +0300\0" "To\0Thomas Garnier <thgarnie@google.com>" Thomas Gleixner <tglx@linutronix.de> @@ -35,7 +35,7 @@ Linux API <linux-api@vger.kernel.org> the arch/x86 maintainers <x86@kernel.org> LKML <linux-kernel@vger.kernel.org> - linux-arm-kernel@lists.infradead.org + <linux-arm-kernel@lists.infradead.org> Kernel Hardening <kernel-hardening@lists.openwall.com> " Octavian Purdila <octavian.purdila@nxp.com>\0" "\00:1\0" @@ -144,4 +144,4 @@ "Regards,\n" Leonard -f9630d17626237b3add8e181520f7ca102536cbe61bf083cbdd928afa7f6cdda +a02c93c4b71eac294dfa6fc6c7f88932aa9848ee08936a1c19407d3a7cee61a1
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.