| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-Id: <20211202223214.72888-7-alexandr.lobakin@intel.com>
Date: Thu, 2 Dec 2021 23:32:06 +0100
From: Alexander Lobakin <alexandr.lobakin@...el.com>
To: linux-hardening@...r.kernel.org, x86@...nel.org
Cc: Alexander Lobakin <alexandr.lobakin@...el.com>,
Jesse Brandeburg <jesse.brandeburg@...el.com>,
Kristen Carlson Accardi <kristen@...ux.intel.com>,
Kees Cook <keescook@...omium.org>,
Miklos Szeredi <miklos@...redi.hu>,
Ard Biesheuvel <ardb@...nel.org>,
Tony Luck <tony.luck@...el.com>,
Bruce Schlobohm <bruce.schlobohm@...el.com>,
Jessica Yu <jeyu@...nel.org>,
kernel test robot <lkp@...el.com>,
Miroslav Benes <mbenes@...e.cz>,
Evgenii Shatokhin <eshatokhin@...tuozzo.com>,
Jonathan Corbet <corbet@....net>,
Masahiro Yamada <masahiroy@...nel.org>,
Michal Marek <michal.lkml@...kovi.net>,
Nick Desaulniers <ndesaulniers@...gle.com>,
Herbert Xu <herbert@...dor.apana.org.au>,
"David S. Miller" <davem@...emloft.net>,
Thomas Gleixner <tglx@...utronix.de>,
Will Deacon <will@...nel.org>, Ingo Molnar <mingo@...hat.com>,
Borislav Petkov <bp@...en8.de>,
Dave Hansen <dave.hansen@...ux.intel.com>,
"H. Peter Anvin" <hpa@...or.com>,
Andy Lutomirski <luto@...nel.org>,
Peter Zijlstra <peterz@...radead.org>,
Arnd Bergmann <arnd@...db.de>,
Josh Poimboeuf <jpoimboe@...hat.com>,
Nathan Chancellor <nathan@...nel.org>,
Masami Hiramatsu <mhiramat@...nel.org>,
Marios Pomonis <pomonis@...gle.com>,
Sami Tolvanen <samitolvanen@...gle.com>,
linux-kernel@...r.kernel.org, linux-kbuild@...r.kernel.org,
linux-arch@...r.kernel.org, live-patching@...r.kernel.org,
llvm@...ts.linux.dev
Subject: [PATCH v8 06/14] FG-KASLR: use a scripted approach to handle .text.* sections
Instead of relying on the linker and his heuristics about where to
place (orphan) .text.* section, use a script to read vmlinux.o and
generate a new .tmp_vmlinux.lds which will contain an entry for
each of them. It relies on a magic marker inside the preprocessed
vmlinux.lds (which is harmless in case FG-KASLR is disabled) and
injects a list of input text sections there.
As a bonus, this approach allows us to configure FG-KASLR in terms
of number of functions per each section. The zero value means one
section per each functions, it is the strongest choice, but the
resulting vmlinux also has the biggest size here, as well as the
total number of sections and the boottime delay (which is still
barely noticeable). The values of 4-8 are still strong enough and
allows to save some space, and so on.
We also keep tracking the maximal alignment we found while
traversing through the readelf output and the number of times we
spotted it. It's actual only for values >= 64 and is required to
reserve some space between the last .text.* section and the _etext
marker.
The reason is that e.g. x86 has at least 3 ASM sections (4 with
ClangCFI) aligned to 4096, and when mixing them with the small
sections, we could go past the _etext and render the kernel
unbootable. This reserved space ensures this won't happen.
Signed-off-by: Alexander Lobakin <alexandr.lobakin@...el.com>
---
arch/x86/kernel/vmlinux.lds.S | 4 +-
include/asm-generic/vmlinux.lds.h | 6 ++
init/Kconfig | 14 +++
scripts/generate_text_sections.pl | 156 ++++++++++++++++++++++++++++++
scripts/link-vmlinux.sh | 25 ++++-
5 files changed, 203 insertions(+), 2 deletions(-)
create mode 100755 scripts/generate_text_sections.pl
diff --git a/arch/x86/kernel/vmlinux.lds.S b/arch/x86/kernel/vmlinux.lds.S
index e1db74452485..532daa7fc888 100644
--- a/arch/x86/kernel/vmlinux.lds.S
+++ b/arch/x86/kernel/vmlinux.lds.S
@@ -147,9 +147,11 @@ SECTIONS
#endif
} :text =0xcccc
+ TEXT_FG_KASLR
+
/* End of text section, which should occupy whole number of pages */
- _etext = .;
. = ALIGN(PAGE_SIZE);
+ _etext = .;
X86_ALIGN_RODATA_BEGIN
RO_DATA(PAGE_SIZE)
diff --git a/include/asm-generic/vmlinux.lds.h b/include/asm-generic/vmlinux.lds.h
index 96fbedcbf7c8..8ddc08baf50c 100644
--- a/include/asm-generic/vmlinux.lds.h
+++ b/include/asm-generic/vmlinux.lds.h
@@ -127,6 +127,12 @@
#define TEXT_MAIN .text
#endif
+/*
+ * Used by scripts/generate_text_sections.pl to inject text sections,
+ * harmless if FG-KASLR is disabled.
+ */
+#define TEXT_FG_KASLR __fg_kaslr_magic = .;
+
/*
* GCC 4.5 and later have a 32 bytes section alignment for structures.
* Except GCC 4.9, that feels the need to align on 64 bytes.
diff --git a/init/Kconfig b/init/Kconfig
index 5cb8f8230915..8baeaef382c9 100644
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -2063,6 +2063,20 @@ config FG_KASLR
If unsure, say N.
+config FG_KASLR_SHIFT
+ int "FG-KASLR granularity (number of functions per section shift)"
+ depends on FG_KASLR
+ range 0 16
+ default 0
+ help
+ This sets the number of functions that will be put in each section
+ as a power of two.
+ Decreasing the value increases the randomization, but also increases
+ the size of the final kernel/vmlinux due to the amount of sections.
+ 0 means that a separate section will be created for each function.
+ 16 almost disables the randomization, leaving only the manual
+ separation.
+
endmenu # General setup
source "arch/Kconfig"
diff --git a/scripts/generate_text_sections.pl b/scripts/generate_text_sections.pl
new file mode 100755
index 000000000000..6871045fb7a6
--- /dev/null
+++ b/scripts/generate_text_sections.pl
@@ -0,0 +1,156 @@
+#!/usr/bin/env perl
+# SPDX-License-Identifier: GPL-2.0-only
+#
+# Generates a new LD script with every .text.* section described for FG-KASLR
+# to avoid orphan/heuristic section placement and double-checks we don't have
+# any symbols in plain .text section.
+#
+# Copyright (C) 2021, Intel Corporation.
+# Author: Alexander Lobakin <alexandr.lobakin@...el.com>
+#
+
+use strict;
+use warnings;
+
+## parameters
+my $expecting = 0;
+my $shift = 0;
+my $file;
+
+foreach (@ARGV) {
+ if ($_ eq '-s') {
+ $expecting = 1;
+ } elsif ($expecting) {
+ $shift = $_ + 0;
+ if ($shift < 0) {
+ $shift = 0;
+ } elsif ($shift > 16) {
+ $shift = 16;
+ }
+ $expecting = 0;
+ } elsif (!defined($file)) {
+ $file = $_;
+ } else {
+ die "$0: usage: $0 [-s shift] binary < linker script";
+ }
+}
+
+if (!defined($file)) {
+ die "$0: usage: $0 [-s shift] binary < linker script";
+}
+
+## environment
+my $readelf = $ENV{'READELF'} || die "$0: ERROR: READELF not set?";
+
+## text sections array
+my @sections = ();
+my $has_ccf = 0;
+
+## max alignment found to reserve some space
+my $max_align = 64;
+my $count = 0;
+
+sub read_sections {
+ open(my $fh, "\"$readelf\" -SW \"$file\" 2>/dev/null |")
+ or die "$0: ERROR: failed to execute \"$readelf\": $!";
+
+ while (<$fh>) {
+ my $name;
+ my $align;
+ chomp;
+
+ ($name, $align) = $_ =~ /^\s*\[[\s0-9]*\]\s*(\.\S*)\s*[A-Z]*\s*[0-9a-f]{16}\s*[0-9a-f]*\s*[0-9a-f]*\s*[0-9a-f]*\s*[0-9a-f]{2}\s*[A-Z]{2}\s*[0-9]\s*[0-9]\s*([0-9]*)$/;
+
+ if (!defined($name)) {
+ next;
+ }
+
+ ## Clang 13 onwards emits __cfi_check_fail only on final
+ ## linking, so it won't appear in .o files and will be
+ ## missing in @sections. Add it manually to prevent
+ ## spawning orphans.
+ if ($name eq ".text.__cfi_check_fail") {
+ $has_ccf = 1;
+ }
+
+ if (!($name =~ /^\.text\.[0-9a-zA-Z_]*((\.constprop|\.isra|\.part)\.[0-9])*(|\.[0-9cfi]*)$/)) {
+ next;
+ }
+
+ if ($align > $max_align) {
+ $max_align = $align;
+ $count = 1;
+ } elsif ($align == $max_align) {
+ $count++;
+ }
+
+ push(@sections, $name);
+ }
+
+ close($fh);
+
+ if (!$has_ccf) {
+ push(@sections, ".text.__cfi_check_fail");
+ }
+
+ @sections = sort @sections;
+}
+
+sub print_sections {
+ my $fps = 1 << $shift;
+ my $counter = 1;
+
+ print "\t.text.0 : ALIGN(16) {\n";
+ print "\t\t*(.text)\n";
+ print "\t}\n";
+
+ print "\tASSERT(SIZEOF(.text.0) == 0, \"Plain .text is not empty!\")\n\n";
+
+ if (!@...tions) {
+ return;
+ }
+
+ while () {
+ print "\t.text.$counter : ALIGN(16) {\n";
+
+ my @a = (($counter - 1) * $fps .. ($counter * $fps) - 1);
+ for (@a) {
+ print "\t\t*($sections[$_])\n";
+
+ if ($sections[$_] eq $sections[-1]) {
+ print "\t}\n";
+ return;
+ }
+ }
+
+ print "\t}\n";
+ $counter++;
+ }
+}
+
+sub print_reserve {
+ ## If we have text sections aligned with 64 bytes or more, make
+ ## sure we reserve some space for them to not overlap _etext
+ ## while shuffling sections.
+ if (!$count) {
+ return;
+ }
+
+ print "\n\t. += $max_align * $count;\n";
+}
+
+sub print_lds {
+ while (<STDIN>) {
+ if ($_ =~ /^\s*__fg_kaslr_magic = \.;$/) {
+ print_sections();
+ print_reserve();
+ } else {
+ print $_;
+ }
+ }
+}
+
+## main
+
+read_sections();
+print_lds();
diff --git a/scripts/link-vmlinux.sh b/scripts/link-vmlinux.sh
index 5cdd9bc5c385..9245351a38d9 100755
--- a/scripts/link-vmlinux.sh
+++ b/scripts/link-vmlinux.sh
@@ -66,6 +66,18 @@ gen_symversions()
done
}
+# If CONFIG_FG_KASLR is selected, generate a linker script which will
+# declare all custom text sections for future boottime shuffling
+gen_text_sections()
+{
+ info GEN .tmp_vmlinux.lds
+
+ ${PERL} ${srctree}/scripts/generate_text_sections.pl \
+ -s "${CONFIG_FG_KASLR_SHIFT}" vmlinux.o \
+ < "${objtree}/${KBUILD_LDS}" \
+ > .tmp_vmlinux.lds
+}
+
# Link of vmlinux.o used for section mismatch analysis
# ${1} output file
modpost_link()
@@ -155,12 +167,19 @@ vmlinux_link()
local ld
local ldflags
local ldlibs
+ local lds
info LD ${output}
# skip output file argument
shift
+ if [ -n "${CONFIG_FG_KASLR}" ]; then
+ lds=".tmp_vmlinux.lds"
+ else
+ lds="${objtree}/${KBUILD_LDS}"
+ fi
+
if [ -n "${CONFIG_LTO_CLANG}" ]; then
# Use vmlinux.o instead of performing the slow LTO link again.
objs=vmlinux.o
@@ -182,7 +201,7 @@ vmlinux_link()
ldlibs=
fi
- ldflags="${ldflags} ${wl}--script=${objtree}/${KBUILD_LDS}"
+ ldflags="${ldflags} ${wl}--script=${lds}"
# The kallsyms linking does not need debug symbols included.
if [ "$output" != "${output#.tmp_vmlinux.kallsyms}" ] ; then
@@ -342,6 +361,10 @@ info GEN modules.builtin
tr '\0' '\n' < modules.builtin.modinfo | sed -n 's/^[[:alnum:]:_]*\.file=//p' |
tr ' ' '\n' | uniq | sed -e 's:^:kernel/:' -e 's/$/.ko/' > modules.builtin
+if [ -n "${CONFIG_FG_KASLR}" ]; then
+ gen_text_sections
+fi
+
btf_vmlinux_bin_o=""
if [ -n "${CONFIG_DEBUG_INFO_BTF}" ]; then
btf_vmlinux_bin_o=.btf.vmlinux.bin.o
--
2.33.1
Powered by blists - more mailing lists