From: "H. Peter Anvin" <hpa@zytor.com>
To: Kees Cook <keescook@chromium.org>, Ingo Molnar <mingo@kernel.org>
Cc: Borislav Petkov <bp@suse.de>, Baoquan He <bhe@redhat.com>,
Yinghai Lu <yinghai@kernel.org>,
Thomas Gleixner <tglx@linutronix.de>,
Ingo Molnar <mingo@redhat.com>,
x86@kernel.org, Andrew Morton <akpm@linux-foundation.org>,
Josh Poimboeuf <jpoimboe@redhat.com>,
Andrey Ryabinin <aryabinin@virtuozzo.com>,
"H.J. Lu" <hjl.tools@gmail.com>,
Dmitry Vyukov <dvyukov@google.com>,
linux-kernel@vger.kernel.org
Subject: Re: [PATCH] x86/boot: Refuse to build with data relocations
Date: Thu, 12 May 2016 15:29:50 -0700 [thread overview]
Message-ID: <B09F32EB-DA6E-4A8C-9C7B-DF99B7A2FC62@zytor.com> (raw)
In-Reply-To: <20160512203104.GA7425@www.outflux.net>
On May 12, 2016 1:31:04 PM PDT, Kees Cook <keescook@chromium.org> wrote:
>The compressed kernel is built with -fPIC/-fPIE so that it can run in
>any
>location a bootloader happens to put it. However, since ELF relocation
>processing is not happening (and all the relocation information has
>already been stripped at link time), none of the code can use data
>relocations (e.g. static assignments of pointers). This is already
>noted
>in a warning comment at the top of misc.c, but this adds an explicit
>check for the condition during the linking stage to block any such bugs
>from appearing.
>
>If this was in place with the earlier bug in pagetable.c, the build
>would fail like this:
>
> ...
> CC arch/x86/boot/compressed/pagetable.o
> DATAREL arch/x86/boot/compressed/vmlinux
> error: arch/x86/boot/compressed/pagetable.o has data relocations!
> make[2]: *** [arch/x86/boot/compressed/vmlinux] Error 1
> ...
>
>A clean build shows the new check:
>
> ...
> CC arch/x86/boot/compressed/pagetable.o
> DATAREL arch/x86/boot/compressed/vmlinux
> LD arch/x86/boot/compressed/vmlinux
> ...
>
>Suggested-by: Ingo Molnar <mingo@kernel.org>
>Signed-off-by: Kees Cook <keescook@chromium.org>
>---
> arch/x86/boot/compressed/Makefile | 18 ++++++++++++++++++
> 1 file changed, 18 insertions(+)
>
>diff --git a/arch/x86/boot/compressed/Makefile
>b/arch/x86/boot/compressed/Makefile
>index cfdd8c3f8af2..25d477fcd5b4 100644
>--- a/arch/x86/boot/compressed/Makefile
>+++ b/arch/x86/boot/compressed/Makefile
>@@ -85,7 +85,25 @@ vmlinux-objs-$(CONFIG_EFI_STUB) += $(obj)/eboot.o
>$(obj)/efi_stub_$(BITS).o \
> $(objtree)/drivers/firmware/efi/libstub/lib.a
> vmlinux-objs-$(CONFIG_EFI_MIXED) += $(obj)/efi_thunk_$(BITS).o
>
>+# The compressed kernel is built with -fPIC/-fPIE so that a boot
>loader
>+# can place it anywhere in memory and it will still run. However,
>since
>+# it is executed as-is without any ELF relocation processing performed
>+# (and has already had all relocation sections stripped from the
>binary),
>+# none of the code can use data relocations (e.g. static assignments
>of
>+# pointer values), since they will be meaningless at runtime. This
>check
>+# will refuse to link the vmlinux if any of these relocations are
>found.
>+quiet_cmd_check_data_rel = DATAREL $@
>+define cmd_check_data_rel
>+ for obj in $(filter %.o,$^); do \
>+ readelf -S $$obj | grep -qF .data.rel && { \
>+ echo "error: $$obj has data relocations!" >&2; \
>+ exit 1; \
>+ } || true; \
>+ done
>+endef
>+
> $(obj)/vmlinux: $(vmlinux-objs-y) FORCE
>+ $(call if_changed,check_data_rel)
> $(call if_changed,ld)
> @:
>
It would be far better to warn on the *type* of relocations rather than in which section they feel.
--
Sent from my Android device with K-9 Mail. Please excuse brevity and formatting.
next prev parent reply other threads:[~2016-05-12 22:30 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-05-12 20:31 Kees Cook
2016-05-12 22:29 ` H. Peter Anvin [this message]
2016-05-12 22:54 ` Kees Cook
2016-05-13 20:45 ` H. Peter Anvin
2016-05-16 10:30 ` Ingo Molnar
2016-05-17 8:13 ` Kees Cook
2016-05-17 9:31 ` H. Peter Anvin
2016-05-17 13:53 ` Kees Cook
2016-05-17 16:56 ` H. Peter Anvin
2016-05-17 19:28 ` Kees Cook
2016-05-17 19:33 ` H. Peter Anvin
2016-05-18 8:29 ` Ingo Molnar
2016-05-18 14:11 ` Kees Cook
2016-05-20 6:41 ` Ingo Molnar
2016-05-20 16:37 ` Kees Cook
2016-05-16 15:57 ` Josh Poimboeuf
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=B09F32EB-DA6E-4A8C-9C7B-DF99B7A2FC62@zytor.com \
--to=hpa@zytor.com \
--cc=akpm@linux-foundation.org \
--cc=aryabinin@virtuozzo.com \
--cc=bhe@redhat.com \
--cc=bp@suse.de \
--cc=dvyukov@google.com \
--cc=hjl.tools@gmail.com \
--cc=jpoimboe@redhat.com \
--cc=keescook@chromium.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=mingo@redhat.com \
--cc=tglx@linutronix.de \
--cc=x86@kernel.org \
--cc=yinghai@kernel.org \
/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: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®