Commit e544ea57 authored by Ard Biesheuvel's avatar Ard Biesheuvel Committed by Ingo Molnar
Browse files

x86/boot/compressed: Force hidden visibility for all symbol references 



Eliminate all GOT entries in the decompressor binary, by forcing hidden
visibility for all symbol references, which informs the compiler that
such references will be resolved at link time without the need for
allocating GOT entries.

To ensure that no GOT entries will creep back in, add an assertion to
the decompressor linker script that will fire if the .got section has
a non-zero size.

[Arvind: move hidden.h to include/linux instead of making a copy]

Signed-off-by: default avatarArd Biesheuvel <ardb@kernel.org>
Signed-off-by: default avatarArvind Sankar <nivedita@alum.mit.edu>
Signed-off-by: default avatarKees Cook <keescook@chromium.org>
Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
Tested-by: default avatarNick Desaulniers <ndesaulniers@google.com>
Tested-by: default avatarSedat Dilek <sedat.dilek@gmail.com>
Reviewed-by: default avatarKees Cook <keescook@chromium.org>
Acked-by: default avatarArvind Sankar <nivedita@alum.mit.edu>
Link: https://lore.kernel.org/r/20200731230820.1742553-3-keescook@chromium.org
parent 262b5cae

arch/x86/boot/compressed/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -43,6 +43,7 @@ KBUILD_CFLAGS += -Wno-pointer-sign 
KBUILD_CFLAGS += $(call cc-option,-fmacro-prefix-map=$(srctree)/=)

KBUILD_CFLAGS += -fno-asynchronous-unwind-tables

KBUILD_CFLAGS += -D__DISABLE_EXPORTS

KBUILD_CFLAGS += -include $(srctree)/include/linux/hidden.h



KBUILD_AFLAGS  := $(KBUILD_CFLAGS) -D__ASSEMBLY__

GCOV_PROFILE := n

arch/x86/boot/compressed/vmlinux.lds.S

+1 −0
Original line number Diff line number Diff line
@@ -81,6 +81,7 @@ SECTIONS 
	DISCARDS

}



ASSERT(SIZEOF(.got) == 0, "Unexpected GOT entries detected!")

#ifdef CONFIG_X86_64

ASSERT(SIZEOF(.got.plt) == 0 || SIZEOF(.got.plt) == 0x18, "Unexpected GOT/PLT entries detected!")

#else

drivers/firmware/efi/libstub/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ cflags-$(CONFIG_ARM) := $(subst $(CC_FLAGS_FTRACE),,$(KBUILD_CFLAGS)) \ 
cflags-$(CONFIG_EFI_GENERIC_STUB) += -I$(srctree)/scripts/dtc/libfdt



KBUILD_CFLAGS			:= $(cflags-y) -Os -DDISABLE_BRANCH_PROFILING \

				   -include $(srctree)/drivers/firmware/efi/libstub/hidden.h \

				   -include $(srctree)/include/linux/hidden.h \

				   -D__NO_FORTIFY \

				   -ffreestanding \

				   -fno-stack-protector \

drivers/firmware/efi/libstub/hidden.h

deleted100644 → 0
+0 −6
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 */

/*

 * To prevent the compiler from emitting GOT-indirected (and thus absolute)

 * references to any global symbols, override their visibility as 'hidden'

 */

#pragma GCC visibility push(hidden)

include/linux/hidden.h

0 → 100644
+19 −0
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 */

/*

 * When building position independent code with GCC using the -fPIC option,

 * (or even the -fPIE one on older versions), it will assume that we are

 * building a dynamic object (either a shared library or an executable) that

 * may have symbol references that can only be resolved at load time. For a

 * variety of reasons (ELF symbol preemption, the CoW footprint of the section

 * that is modified by the loader), this results in all references to symbols

 * with external linkage to go via entries in the Global Offset Table (GOT),

 * which carries absolute addresses which need to be fixed up when the

 * executable image is loaded at an offset which is different from its link

 * time offset.

 *

 * Fortunately, there is a way to inform the compiler that such symbol

 * references will be satisfied at link time rather than at load time, by

 * giving them 'hidden' visibility.

 */



#pragma GCC visibility push(hidden)

CRA Git | Maintained and supported by SUSTech CRA and CCSE