[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <202202081100.8A27D97@keescook>
Date: Tue, 8 Feb 2022 11:03:26 -0800
From: Kees Cook <keescook@...omium.org>
To: Nick Desaulniers <ndesaulniers@...gle.com>
Cc: Arvind Sankar <nivedita@...m.mit.edu>,
Fangrui Song <maskray@...gle.com>,
LKML <linux-kernel@...r.kernel.org>, lkp@...ts.01.org,
lkp@...el.com, kernel test robot <oliver.sang@...el.com>
Subject: Re: [x86] 1099ce55b0: BUG:kernel_NULL_pointer_dereference,address
On Tue, Feb 08, 2022 at 09:44:48AM -0800, Nick Desaulniers wrote:
> On Mon, Feb 7, 2022 at 7:09 PM Kees Cook <keescook@...omium.org> wrote:
> >
> > On Mon, Feb 07, 2022 at 04:23:06PM -0800, Nick Desaulniers wrote:
> > > On Fri, Feb 4, 2022 at 4:37 AM kernel test robot <oliver.sang@...el.com> wrote:
> > > > FYI, we noticed the following commit (built with clang-15):
> > > >
> > > > commit: 1099ce55b0530ff429312dc37362ad43aee8c5c0 ("x86: don't build CONFIG_X86_32 as -ffreestanding")
> > > > https://git.kernel.org/cgit/linux/kernel/git/kees/linux.git for-next/memcpy
> > > >
> > > > in testcase: boot
> > > [...]
> > > I've been having a hard time pinpointing via bisection when this
> > > stopped working. I suspect it's actually the change on llvm's side
> > > that would replace memcmp with bcmp. With this diff, we can boot
> > > ARCH=i386 defconfig
> > >
> > > ```
> > > diff --git a/arch/x86/Makefile b/arch/x86/Makefile
> > > index 7ef211865239..5e4570495206 100644
> > > --- a/arch/x86/Makefile
> > > +++ b/arch/x86/Makefile
> > > @@ -88,6 +88,8 @@ ifeq ($(CONFIG_X86_32),y)
> > > include $(srctree)/arch/x86/Makefile_32.cpu
> > > KBUILD_CFLAGS += $(cflags-y)
> > >
> > > + KBUILD_CFLAGS += -fno-builtin-bcmp
> > > +
> > > ifeq ($(CONFIG_STACKPROTECTOR),y)
> > > ifeq ($(CONFIG_SMP),y)
> > > KBUILD_CFLAGS +=
> > > -mstack-protector-guard-reg=fs
> > > -mstack-protector-guard-symbol=__stack_chk_guard
> > > ```
> > >
> > > It looks like the call argument setup in the _callers_ of memcmp is messed up.
> > >
> > > Before:
> > > pushl %ecx
> > > pushl %ebx
> > > pushl -24(%ebp)
> > > calll bcmp
> > >
> > > After:
> > > movl %ebx, %eax
> > > movl %esi, %edx
> > > movl %ecx, %ebx
> > > calll memcmp
> > >
> > > it looks like they're not obeying `-mregparm=3`.
> > >
> > > https://godbolt.org/z/z3fjveP4h
> > >
> > > Diffing the IR between `-mregparm=3` vs not, it looks like there's an
> > > LLVM IR function argument attribute inreg.
> > > https://llvm.org/docs/LangRef.html#parameter-attributes
> > > >> This indicates that this parameter or return value should be treated in a
> > > >> special target-dependent fashion while emitting code for a function call
> > > >> or return (usually, by putting it in a register as opposed to memory,
> > > >> though some targets use it to distinguish between two different kinds of
> > > >> registers). Use of this attribute is target-specific.
> > >
> > > As is tradition, instcombine is not checking+carrying over the
> > > function argument attributes when replacing calls to memcmp w/ bcmp.
> > >
> > > Before:
> > > %4 = call i32 @memcmp(i8* inreg noundef %3, i8* inreg noundef %0,
> > > i32 inreg noundef %1) #4, !dbg !22
> > >
> > > After:
> > > %bcmp = call i32 @bcmp(i8* %3, i8* %0, i32 %1), !dbg !22
> > >
> > > Filed:
> > > https://github.com/llvm/llvm-project/issues/53645
> > [...]
>
> Yeah, that's what I had in mind yesterday afternoon. Thinking more
> about this in the evening though, I think this is a pretty
> catastrophic compiler bug in LLVM.
>
> The compiler does change the calling convention (somewhat) as part of
> optimizations when the caller and callee are visible within the same
> TU. Here, the callee is not visible, and yet the caller is modifying
> the calling convention with no corresponding change to the callee.
>
> Essentially, -ffreestanding is holding -mregparam=3 together for
> ARCH=i386 LLVM=1 builds. That my above diff that only avoided the
> issue for memcmp -> bcmp was able to boot to command line is kind of a
> miracle. I'm sure there's all kind of things that don't work right,
> and we can't ship that since it will come back to bite us for 32b x86
> (such as Android Cuttlefish).
>
> Do we need to remove -ffreestanding for ARCH=i386 for FORTIFY_SOURCE
> to work _for GCC_?
Nope!
> If yes, then perhaps we can only add -ffreestanding for clang for now?
> If no, then perhaps we should leave -ffreestanding for now?
i.e. disable FORTIFY on Clang+i386? Ok.
> Either way, I would shelve FORTIFY_SOURCE for ARCH=i386 LLVM=1 until
> this compiler bug is fixed (and drop my patch, or I can send a v2).
> https://github.com/llvm/llvm-project/issues/53645
I'm fine with that. I can't imagine the combination of
i386+Clang+FORTIFY being in high demand.
> That said, I would consider this lower priority than
> https://github.com/llvm/llvm-project/issues/53118, which looks like a
> very obvious clang-14 regression (the 14 release is almost done, so
> it's time to fix regression NOW) that produces an true positive
> objtool warning.
+1
I will adjust my series...
--
Kees Cook
Powered by blists - more mailing lists