Function Granular KASLR
Subsystems (7)
v4 cover Function Granular KASLR
Function Granular Kernel Address Space Layout Randomization (fgkaslr)
---------------------------------------------------------------------
This patch set is an implementation of finer grained kernel address space randomization. It rearranges your kernel code at load time
on a per-function level granularity, with only around a second added to boot time.
Changes in v4:
-------------
* dropped the patch to split out change to STATIC definition in x86/boot/compressed/misc.c and replaced with a patch authored by Kees Cook to avoid the duplicate malloc definitions
* Added a section to Documentation/admin-guide/kernel-parameters.txt to document the fgkaslr boot option.
* redesigned the patch to hide the new layout when reading /proc/kallsyms. The previous implementation utilized a dynamically allocated linked list to display the kernel and module symbols in alphabetical order. The new implementation uses a randomly shuffled index array to display the kernel and module symbols in a random order.
Changes in v3:
-------------
* Makefile changes to accommodate CONFIG_LD_DEAD_CODE_DATA_ELIMINATION
* removal of extraneous ALIGN_PAGE from _etext changes
* changed variable names in x86/tools/relocs to be less confusing
* split out change to STATIC definition in x86/boot/compressed/misc.c
* Updates to Documentation to make it more clear what is preserved in .text
* much more detailed commit message for function granular KASLR patch
* minor tweaks and changes that make for more readable code
* this cover letter updated slightly to add additional details
Changes in v2:
--------------
* Fix to address i386 build failure
* Allow module reordering patch to be configured separately so that arm (or other non-x86_64 arches) can take advantage of module function reordering. This support has not be tested by me, but smoke tested by Ard Biesheuvel <[email protected]> on arm.
* Fix build issue when building on arm as reported by
Ard Biesheuvel <[email protected]>
Patches to objtool are included because they are dependencies for this patchset, however they have been submitted by their maintainer separately.
Background
----------
KASLR was merged into the kernel with the objective of increasing the difficulty of code reuse attacks. Code reuse attacks reused existing code snippets to get around existing memory protections. They exploit software bugs which expose addresses of useful code snippets to control the flow of execution for their own nefarious purposes. KASLR moves the entire kernel code text as a unit at boot time in order to make addresses less predictable. The order of the code within the segment is unchanged - only the base address is shifted. There are a few shortcomings to this algorithm.
1. Low Entropy - there are only so many locations the kernel can fit in. This means an attacker could guess without too much trouble.
2. Knowledge of a single address can reveal the offset of the base address, exposing all other locations for a published/known kernel image.
3. Info leaks abound.
Finer grained ASLR has been proposed as a way to make ASLR more resistant to info leaks. It is not a new concept at all, and there are many variations possible. Function reordering is an implementation of finer grained ASLR which randomizes the layout of an address space on a function level granularity. We use the term "fgkaslr" in this document to refer to the technique of function reordering when used with KASLR, as well as finer grained KASLR in general.
Proposed Improvement
--------------------
This patch set proposes adding function reordering on top of the existing KASLR base address randomization. The over-arching objective is incremental improvement over what we already have. It is designed to work in combination with the existing solution. The implementation is really pretty simple, and there are 2 main area where changes occur:
* Build time
GCC has had an option to place functions into individual .text sections for many years now. This option can be used to implement function reordering at load time. The final compiled vmlinux retains all the section headers, which can be used to help find the address ranges of each function. Using this information and an expanded table of relocation addresses, individual text sections can be suffled immediately after decompression. Some data tables inside the kernel that have assumptions about order require re-sorting after being updated when applying relocations. In order to modify these tables, a few key symbols are excluded from the objcopy symbol stripping process for use after shuffling the text segments.
Some highlights from the build time changes to look for:
The top level kernel Makefile was modified to add the gcc flag if it is supported. Currently, I am applying this flag to everything it is possible to randomize. Anything that is written in C and not present in a special input section is randomized. The final binary segment 0 retains a consolidated .text section, as well as all the individual .text.* sections. Future work could turn off this flags for selected files or even entire subsystems, although obviously at the cost of security.
The relocs tool is updated to add relative relocations. This information previously wasn't included because it wasn't necessary when moving the entire .text segment as a unit.
A new file was created to contain a list of symbols that objcopy should keep. We use those symbols at load time as described below.
* Load time
The boot kernel was modified to parse the vmlinux elf file after decompression to check for our interesting symbols that we kept, and to look for any .text.* sections to randomize. The consolidated .text section is skipped and not moved. The sections are shuffled randomly, and copied into memory following the .text section in a new random order. The existing code which updated relocation addresses was modified to account for not just a fixed delta from the load address, but the offset that the function section was moved to. This requires inspection of each address to see if it was impacted by a randomization. We use a bsearch to make this less horrible on performance. Any tables that need to be modified with new addresses or resorted are updated using the symbol addresses parsed from the elf symbol table.
In order to hide our new layout, symbols reported through /proc/kallsyms will be displayed in a random order.
Security Considerations
-----------------------
The objective of this patch set is to improve a technology that is already merged into the kernel (KASLR). This code will not prevent all attacks, but should instead be considered as one of several tools that can be used. In particular, this code is meant to make KASLR more effective in the presence of info leaks.
How much entropy we are adding to the existing entropy of standard KASLR will depend on a few variables. Firstly and most obviously, the number of functions that are randomized matters. This implementation keeps the existing .text section for code that cannot be randomized - for example, because it was assembly code. The less sections to randomize, the less entropy. In addition, due to alignment (16 bytes for x86_64), the number of bits in a address that the attacker needs to guess is reduced, as the lower bits are identical.
Performance Impact
------------------
There are two areas where function reordering can impact performance: boot time latency, and run time performance.
* Boot time latency
This implementation of finer grained KASLR impacts the boot time of the kernel in several places. It requires additional parsing of the kernel ELF file to obtain the section headers of the sections to be randomized. It calls the random number generator for each section to be randomized to determine that section's new memory location. It copies the decompressed kernel into a new area of memory to avoid corruption when laying out the newly randomized sections. It increases the number of relocations the kernel has to perform at boot time vs. standard KASLR, and it also requires a lookup on each address that needs to be relocated to see if it was in a randomized section and needs to be adjusted by a new offset. Finally, it re-sorts a few data tables that are required to be sorted by address.
Booting a test VM on a modern, well appointed system showed an increase in latency of approximately 1 second.
* Run time
The performance impact at run-time of function reordering varies by workload. Using kcbench, a kernel compilation benchmark, the performance of a kernel build with finer grained KASLR was about 1% slower than a kernel with standard KASLR. Analysis with perf showed a slightly higher percentage of L1-icache-load-misses. Other workloads were examined as well, with varied results. Some workloads performed significantly worse under FGKASLR, while others stayed the same or were mysteriously better. In general, it will depend on the code flow whether or not finer grained KASLR will impact your workload, and how the underlying code was designed. Because the layout changes per boot, each time a system is rebooted the performance of a workload may change.
Future work could identify hot areas that may not be randomized and either leave them in the .text section or group them together into a single section that may be randomized. If grouping things together helps, one other thing to consider is that if we could identify text blobs that should be grouped together to benefit a particular code flow, it could be interesting to explore whether this security feature could be also be used as a performance feature if you are interested in optimizing your kernel layout for a particular workload at boot time. Optimizing function layout for a particular workload has been researched and proven effective - for more information read the Facebook paper "Optimizing Function Placement for Large-Scale Data-Center Applications" (see references section below).
Image Size
----------
Adding additional section headers as a result of compiling with -ffunction-sections will increase the size of the vmlinux ELF file. With a standard distro config, the resulting vmlinux was increased by about 3%. The compressed image is also increased due to the header files, as well as the extra relocations that must be added. You can expect fgkaslr to increase the size of the compressed image by about 15%.
Memory Usage
------------
fgkaslr increases the amount of heap that is required at boot time, although this extra memory is released when the kernel has finished decompression. As a result, it may not be appropriate to use this feature on systems without much memory.
Building
--------
To enable fine grained KASLR, you need to have the following config options set (including all the ones you would use to build normal KASLR)
CONFIG_FG_KASLR=y
In addition, fgkaslr is only supported for the X86_64 architecture.
Modules
-------
Modules are randomized similarly to the rest of the kernel by shuffling the sections at load time prior to moving them into memory. The module must also have been build with the -ffunction-sections compiler option.
Although fgkaslr for the kernel is only supported for the X86_64 architecture, it is possible to use fgkaslr with modules on other architectures. To enable this feature, select
CONFIG_MODULE_FG_KASLR=y
This option is selected automatically for X86_64 when CONFIG_FG_KASLR is set.
Disabling
---------
Disabling normal KASLR using the nokaslr command line option also disables fgkaslr. It is also possible to disable fgkaslr separately by booting with fgkaslr=off on the commandline.
References
----------
There are a lot of academic papers which explore finer grained ASLR. This paper in particular contributed the most to my implementation design as well as my overall understanding of the problem space:
Selfrando: Securing the Tor Browser against De-anonymization Exploits, M. Conti, S. Crane, T. Frassetto, et al.
For more information on how function layout impacts performance, see:
Optimizing Function Placement for Large-Scale Data-Center Applications, G. Ottoni, B. Maher
Kees Cook (2):
x86/boot: Allow a "silent" kaslr random byte fetch x86/boot/compressed: Avoid duplicate malloc() implementations
Kristen Carlson Accardi (8):
objtool: Do not assume order of parent/child functions
x86: tools/relocs: Support >64K section headers
x86: Makefile: Add build and config option for CONFIG_FG_KASLR
x86: Make sure _etext includes function sections x86/tools: Add relative relocs for randomized functions
x86: Add support for function granular KASLR
kallsyms: Hide layout
module: Reorder functions
.../admin-guide/kernel-parameters.txt | 7 + Documentation/security/fgkaslr.rst | 172 ++++ Documentation/security/index.rst | 1 + Makefile | 6 +- arch/x86/Kconfig | 4 + arch/x86/Makefile | 5 + arch/x86/boot/compressed/Makefile | 9 +- arch/x86/boot/compressed/fgkaslr.c | 811 ++++++++++++++++++ arch/x86/boot/compressed/kaslr.c | 4 - arch/x86/boot/compressed/misc.c | 157 +++- arch/x86/boot/compressed/misc.h | 30 + arch/x86/boot/compressed/utils.c | 11 + arch/x86/boot/compressed/vmlinux.symbols | 17 + arch/x86/include/asm/boot.h | 15 +- arch/x86/kernel/vmlinux.lds.S | 17 +- arch/x86/lib/kaslr.c | 18 +- arch/x86/tools/relocs.c | 143 ++- arch/x86/tools/relocs.h | 4 +- arch/x86/tools/relocs_common.c | 15 +- include/asm-generic/vmlinux.lds.h | 18 +- include/linux/decompress/mm.h | 12 +- include/uapi/linux/elf.h | 1 + init/Kconfig | 26 + kernel/kallsyms.c | 163 +++- kernel/module.c | 81 ++ tools/objtool/elf.c | 8 +- 26 files changed, 1670 insertions(+), 85 deletions(-) create mode 100644 Documentation/security/fgkaslr.rst create mode 100644 arch/x86/boot/compressed/fgkaslr.c create mode 100644 arch/x86/boot/compressed/utils.c create mode 100644 arch/x86/boot/compressed/vmlinux.symbols
base-commit: 11ba468877bb23f28956a35e896356252d63c983
Signature · 1 line
2.20.1
PATCH v4 1/10 objtool: Do not assume order of parent/child functions
If a .cold function is examined prior to it's parent, the link to the parent/child function can be overwritten when the parent is examined. Only update pfunc and cfunc if they were previously nil to prevent this from happening.
--- tools/objtool/elf.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)
tools/objtool/elf.c +7 -1
@@ -434,7 +434,13 @@ static int read_symbols(struct elf *elf)size_t pnamelen;if (sym->type !=STT_FUNC )continue ; - sym->pfunc = sym->cfunc = sym; + +if (sym->pfunc ==NULL ) + sym->pfunc = sym; + +if (sym->cfunc ==NULL ) + sym->cfunc = sym; + coldstr =strstr (sym->name,".cold" );if (!coldstr)continue ;
Signature · 1 line
2.20.1
PATCH v4 2/10 x86: tools/relocs: Support >64K section headers
In reply to Kristen Carlson AccardiWhile the relocs tool already supports finding the total number of section headers if vmlinux exceeds 64K sections, it fails to read the extended symbol table to get section header indexes for symbols, causing incorrect symbol table indexes to be used when there are > 64K symbols.
Parse the elf file to read the extended symbol table info, and then replace all direct references to st_shndx with calls to sym_index(), which will determine whether the value can be read directly or whether the value should be pulled out of the extended table.
--- arch/x86/tools/relocs.c | 104 ++++++++++++++++++++++++++++++---------- 1 file changed, 78 insertions(+), 26 deletions(-)
arch/x86/tools/relocs.c +78 -26
@@ -14,6 +14,10 @@static Elf_Ehdr ehdr;static unsigned long shnum;static unsigned int shstrndx; +static unsigned int shsymtabndx; +static unsigned int shxsymtabndx; + +static int sym_index (Elf_Sym *sym);struct relocs {uint32_t *offset;
@@ -32,6 +36,7 @@ struct section {Elf_Shdr shdr;struct section *link;Elf_Sym *symtab; +Elf32_Word *xsymtab;Elf_Rel *reltab;char *strtab; };
@@ -265,7 +270,7 @@ static const char *sym_name(const char *sym_strtab, Elf_Sym *sym) name = sym_strtab + sym->st_name; }else { - name =sec_name (sym->st_shndx); + name =sec_name (sym_index (sym)); }return name; }
@@ -335,6 +340,23 @@ static uint64_t elf64_to_cpu(uint64_t val)#define elf_xword_to_cpu (x) elf32_to_cpu(x)#endif +static int sym_index (Elf_Sym *sym) +{ +Elf_Sym *symtab = secs[shsymtabndx].symtab; +Elf32_Word *xsymtab = secs[shxsymtabndx].xsymtab; +unsigned long offset; +int index; + +if (sym->st_shndx !=SHN_XINDEX ) +return sym->st_shndx; + +/* calculate offset of sym from head of table. */ + offset = (unsigned long )sym - (unsigned long )symtab; + index = offset /sizeof (*sym); + +return elf32_to_cpu (xsymtab[index]); +} +static void read_ehdr (FILE *fp) {if (fread (&ehdr,sizeof (ehdr),1 , fp) !=1 ) {
@@ -468,31 +490,60 @@ static void read_strtabs(FILE *fp)static void read_symtabs (FILE *fp) {int i,j; +for (i =0 ; i < shnum; i++) {struct section *sec = &secs[i]; -if (sec->shdr.sh_type !=SHT_SYMTAB ) { +int num_syms; + +switch (sec->shdr.sh_type) { +case SHT_SYMTAB_SHNDX : + sec->xsymtab =malloc (sec->shdr.sh_size); +if (!sec->xsymtab) { +die ("malloc of %d bytes for xsymtab failed\n" , + sec->shdr.sh_size); + } +if (fseek (fp, sec->shdr.sh_offset,SEEK_SET ) <0 ) { +die ("Seek to %d failed: %s\n" , + sec->shdr.sh_offset,strerror (errno)); + } +if (fread (sec->xsymtab,1 , sec->shdr.sh_size, fp) + != sec->shdr.sh_size) { +die ("Cannot read extended symbol table: %s\n" , +strerror (errno)); + } + shxsymtabndx = i; +continue ; + +case SHT_SYMTAB : + num_syms = sec->shdr.sh_size /sizeof (Elf_Sym); + + sec->symtab =malloc (sec->shdr.sh_size); +if (!sec->symtab) { +die ("malloc of %d bytes for symtab failed\n" , + sec->shdr.sh_size); + } +if (fseek (fp, sec->shdr.sh_offset,SEEK_SET ) <0 ) { +die ("Seek to %d failed: %s\n" , + sec->shdr.sh_offset,strerror (errno)); + } +if (fread (sec->symtab,1 , sec->shdr.sh_size, fp) + != sec->shdr.sh_size) { +die ("Cannot read symbol table: %s\n" , +strerror (errno)); + } +for (j =0 ; j < num_syms; j++) { +Elf_Sym *sym = &sec->symtab[j]; + + sym->st_name =elf_word_to_cpu (sym->st_name); + sym->st_value =elf_addr_to_cpu (sym->st_value); + sym->st_size =elf_xword_to_cpu (sym->st_size); + sym->st_shndx =elf_half_to_cpu (sym->st_shndx); + } + shsymtabndx = i; +continue ; + +default :continue ; - } - sec->symtab =malloc (sec->shdr.sh_size); -if (!sec->symtab) { -die ("malloc of %d bytes for symtab failed\n" , - sec->shdr.sh_size); - } -if (fseek (fp, sec->shdr.sh_offset,SEEK_SET ) <0 ) { -die ("Seek to %d failed: %s\n" , - sec->shdr.sh_offset,strerror (errno)); - } -if (fread (sec->symtab,1 , sec->shdr.sh_size, fp) - != sec->shdr.sh_size) { -die ("Cannot read symbol table: %s\n" , -strerror (errno)); - } -for (j =0 ; j < sec->shdr.sh_size/sizeof (Elf_Sym); j++) { -Elf_Sym *sym = &sec->symtab[j]; - sym->st_name =elf_word_to_cpu (sym->st_name); - sym->st_value =elf_addr_to_cpu (sym->st_value); - sym->st_size =elf_xword_to_cpu (sym->st_size); - sym->st_shndx =elf_half_to_cpu (sym->st_shndx); } } }
@@ -759,13 +810,14 @@ static void percpu_init(void)*/ static int is_percpu_sym (ElfW (Sym) *sym,const char *symname) { -return (sym->st_shndx == per_cpu_shndx) && +int shndx =sym_index (sym); + +return (shndx == per_cpu_shndx) &&strcmp (symname,"__init_begin" ) &&strcmp (symname,"__per_cpu_load" ) &&strncmp (symname,"init_per_cpu_" ,13 ); } -static int do_reloc64 (struct section *sec,Elf_Rel *rel,ElfW (Sym) *sym,const char *symname) {
@@ -1088,7 +1140,7 @@ static int do_reloc_info(struct section *sec, Elf_Rel *rel, ElfW(Sym) *sym,sec_name (sec->shdr.sh_info),rel_type (ELF_R_TYPE (rel->r_info)), symname, - sec_name(sym->st_shndx)); + sec_name(sym_index(sym)));return 0 ; }
Signature · 1 line
2.20.1
PATCH v4 3/10 x86/boot: Allow a "silent" kaslr random byte fetch
In reply to Kristen Carlson AccardiFrom: Kees Cook <[email protected]>
Under earlyprintk, each RNG call produces a debug report line. When shuffling hundreds of functions, this is not useful information (each line is identical and tells us nothing new). Instead, allow for a NULL "purpose" to suppress the debug reporting.
--- arch/x86/lib/kaslr.c | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-)
arch/x86/lib/kaslr.c +12 -6
@@ -56,11 +56,14 @@ unsigned long kaslr_get_random_long(const char *purpose)unsigned long raw, random =get_boot_seed ();bool use_i8254 = true; -debug_putstr (purpose); -debug_putstr (" KASLR using" ); +if (purpose) { +debug_putstr (purpose); +debug_putstr (" KASLR using" ); + }if (has_cpuflag (X86_FEATURE_RDRAND )) { -debug_putstr (" RDRAND" ); +if (purpose) +debug_putstr (" RDRAND" );if (rdrand_long (&raw)) { random ^= raw; use_i8254 = false;
@@ -68,7 +71,8 @@ unsigned long kaslr_get_random_long(const char *purpose) }if (has_cpuflag (X86_FEATURE_TSC )) { -debug_putstr (" RDTSC" ); +if (purpose) +debug_putstr (" RDTSC" ); raw =rdtsc (); random ^= raw;
@@ -76,7 +80,8 @@ unsigned long kaslr_get_random_long(const char *purpose) }if (use_i8254) { -debug_putstr (" i8254" ); +if (purpose) +debug_putstr (" i8254" ); random ^=i8254 (); }
@@ -86,7 +91,8 @@ unsigned long kaslr_get_random_long(const char *purpose) : "a" (random), "rm" (mix_const)); random += raw; -debug_putstr ("...\n" ); +if (purpose) +debug_putstr ("...\n" );return random; }
Signature · 1 line
2.20.1
PATCH v4 4/10 x86: Makefile: Add build and config option for CONFIG_FG_KASLR
In reply to Kristen Carlson AccardiAllow user to select CONFIG_FG_KASLR if dependencies are met. Change the make file to build with -ffunction-sections if CONFIG_FG_KASLR.
While the only architecture that supports CONFIG_FG_KASLR does not currently enable HAVE_LD_DEAD_CODE_DATA_ELIMINATION, make sure these 2 features play nicely together for the future by ensuring that if CONFIG_LD_DEAD_CODE_DATA_ELIMINATION is selected when used with CONFIG_FG_KASLR the function sections will not be consolidated back into .text. Thanks to Kees Cook for the dead code elimination changes.
--- Makefile | 6 +++++- arch/x86/Kconfig | 4 ++++ include/asm-generic/vmlinux.lds.h | 16 ++++++++++++++-- init/Kconfig | 14 ++++++++++++++ 4 files changed, 37 insertions(+), 3 deletions(-)
Makefile +5 -1
@@ -872,7 +872,7 @@ KBUILD_CFLAGS += $(call cc-option, -fno-inline-functions-called-once) endif ifdef CONFIG_LD_DEAD_CODE_DATA_ELIMINATION -KBUILD_CFLAGS_KERNEL += -ffunction-sections -fdata-sections +KBUILD_CFLAGS_KERNEL += -fdata-sections LDFLAGS_vmlinux += --gc-sections endif
@@ -880,6 +880,10 @@ ifdef CONFIG_LIVEPATCH KBUILD_CFLAGS += $(call cc-option, -flive-patching=inline-clone) endif +ifneq ($(CONFIG_LD_DEAD_CODE_DATA_ELIMINATION)$(CONFIG_FG_KASLR),) +KBUILD_CFLAGS += -ffunction-sections +endif + ifdef CONFIG_SHADOW_CALL_STACK CC_FLAGS_SCS := -fsanitize=shadow-call-stack KBUILD_CFLAGS += $(CC_FLAGS_SCS)
arch/x86/Kconfig +4 -0
@@ -372,6 +372,10 @@ config CC_HAS_SANE_STACKPROTECTOR We have to make sure stack protector is unconditionally disabled if the compiler produces broken code. +config ARCH_HAS_FG_KASLR + def_bool y + depends on RANDOMIZE_BASE && X86_64 + menu "Processor type and features" config ZONE_DMA
include/asm-generic/vmlinux.lds.h +14 -2
@@ -93,14 +93,12 @@* sections to be brought in with rodata. */ #ifdef CONFIG_LD_DEAD_CODE_DATA_ELIMINATION -#define TEXT_MAIN .text .text.[0-9a-zA-Z_]*#define DATA_MAIN .data .data.[0-9a-zA-Z_]* .data..LPBX*#define SDATA_MAIN .sdata .sdata.[0-9a-zA-Z_]*#define RODATA_MAIN .rodata .rodata.[0-9a-zA-Z_]*#define BSS_MAIN .bss .bss.[0-9a-zA-Z_]*#define SBSS_MAIN .sbss .sbss.[0-9a-zA-Z_]*#else -#define TEXT_MAIN .text#define DATA_MAIN .data#define SDATA_MAIN .sdata#define RODATA_MAIN .rodata
@@ -108,6 +106,20 @@#define SBSS_MAIN .sbss#endif +/* +* Both LD_DEAD_CODE_DATA_ELIMINATION and CONFIG_FG_KASLR options enable +* -ffunction-sections, which produces separately named .text sections. In +* the case of CONFIG_FG_KASLR, they need to stay distict so they can be +* separately randomized. Without CONFIG_FG_KASLR, the separate .text +* sections can be collected back into a common section, which makes the +* resulting image slightly smaller +*/ +#if defined(CONFIG_LD_DEAD_CODE_DATA_ELIMINATION ) && !defined(CONFIG_FG_KASLR ) +#define TEXT_MAIN .text .text.[0-9a-zA-Z_]* +#else +#define TEXT_MAIN .text +#endif +/* * Align to a 32 byte boundary equal to the * alignment gcc 4.5 uses for a struct
init/Kconfig +14 -0
@@ -1990,6 +1990,20 @@ config PROFILING config TRACEPOINTS bool +config FG_KASLR + bool "Function Granular Kernel Address Space Layout Randomization" + depends on $(cc-option, -ffunction-sections) + depends on ARCH_HAS_FG_KASLR + default n + help + This option improves the randomness of the kernel text + over basic Kernel Address Space Layout Randomization (KASLR) + by reordering the kernel text at boot time. This feature + uses information generated at compile time to re-layout the + kernel text section at boot time at function level granularity. + + If unsure, say N. + endmenu # General setup source "arch/Kconfig"
Signature · 1 line
2.20.1
PATCH v4 5/10 x86: Make sure _etext includes function sections
In reply to Kristen Carlson AccardiWhen using -ffunction-sections to place each function in it's own text section so it can be randomized at load time, the linker considers these .text.* sections "orphaned sections", and will place them after the first similar section (.text). In order to accurately represent the end of the text section and the orphaned sections, _etext must be moved so that it is after both .text and .text.* The text size must also be calculated to include .text AND .text.*
--- arch/x86/kernel/vmlinux.lds.S | 17 +++++++++++++++-- include/asm-generic/vmlinux.lds.h | 2 +- 2 files changed, 16 insertions(+), 3 deletions(-)
arch/x86/kernel/vmlinux.lds.S +15 -2
@@ -146,9 +146,22 @@ SECTIONS #endif } :text =0xcccc - /* End of text section, which should occupy whole number of pages */ - _etext = .; + /* + * -ffunction-sections creates .text.* sections, which are considered + * "orphan sections" and added after the first similar section (.text). + * Placing this ALIGN statement before _etext causes the address of + * _etext to be below that of all the .text.* orphaned sections + */ . = ALIGN(PAGE_SIZE); + _etext = .; + + /* + * the size of the .text section is used to calculate the address + * range for orc lookups. If we just use SIZEOF(.text), we will + * miss all the .text.* sections. Calculate the size using _etext + * and _stext and save the value for later. + */ + text_size = _etext - _stext; X86_ALIGN_RODATA_BEGIN RO_DATA(PAGE_SIZE)
include/asm-generic/vmlinux.lds.h +1 -1
@@ -835,7 +835,7 @@ . = ALIGN(4); \ .orc_lookup : AT(ADDR(.orc_lookup) - LOAD_OFFSET) { \ orc_lookup = .; \ - . += (((SIZEOF(.text) + LOOKUP_BLOCK_SIZE - 1) / \ + . += (((text_size + LOOKUP_BLOCK_SIZE - 1) / \LOOKUP_BLOCK_SIZE ) +1 ) *4 ; \ orc_lookup_end = .; \ }
Signature · 1 line
2.20.1
PATCH v4 6/10 x86/tools: Add relative relocs for randomized functions
In reply to Kristen Carlson AccardiWhen reordering functions, the relative offsets for relocs that are either in the randomized sections, or refer to the randomized sections will need to be adjusted. Add code to detect whether a reloc satisfies these cases, and if so, add them to the appropriate reloc list.
--- arch/x86/boot/compressed/Makefile | 7 +++++- arch/x86/tools/relocs.c | 41 ++++++++++++++++++++++++++++--- arch/x86/tools/relocs.h | 4 +-- arch/x86/tools/relocs_common.c | 15 +++++++---- 4 files changed, 55 insertions(+), 12 deletions(-)
arch/x86/boot/compressed/Makefile +6 -1
@@ -119,6 +119,11 @@ $(obj)/vmlinux: $(vmlinux-objs-y) FORCE $(call if_changed,check-and-link-vmlinux) OBJCOPYFLAGS_vmlinux.bin := -R .comment -S + +ifdef CONFIG_FG_KASLR + RELOCS_ARGS += --fg-kaslr +endif + $(obj)/vmlinux.bin: vmlinux FORCE $(call if_changed,objcopy)
@@ -126,7 +131,7 @@ targets += $(patsubst $(obj)/%,%,$(vmlinux-objs-y)) vmlinux.bin.all vmlinux.relo CMD_RELOCS = arch/x86/tools/relocs quiet_cmd_relocs = RELOCS $@ - cmd_relocs = $(CMD_RELOCS) $< > $@;$(CMD_RELOCS) --abs-relocs $< + cmd_relocs = $(CMD_RELOCS) $(RELOCS_ARGS) $< > $@;$(CMD_RELOCS) $(RELOCS_ARGS) --abs-relocs $< $(obj)/vmlinux.relocs: vmlinux FORCE $(call if_changed,relocs)
arch/x86/tools/relocs.c +37 -4
70 lines not on this page · raw message
arch/x86/tools/relocs.h +2 -2
@@ -31,8 +31,8 @@ enum symtype {void process_32 (FILE *fp,int use_real_mode,int as_text,int show_absolute_syms,int show_absolute_relocs, -int show_reloc_info); +int show_reloc_info,int fgkaslr);void process_64 (FILE *fp,int use_real_mode,int as_text,int show_absolute_syms,int show_absolute_relocs, -int show_reloc_info); +int show_reloc_info,int fgkaslr);#endif /* RELOCS_H */
arch/x86/tools/relocs_common.c +10 -5
@@ -12,14 +12,14 @@ void die(char *fmt, ...)static void usage (void ) { -die ("relocs [--abs-syms|--abs-relocs|--reloc-info|--text|--realmode]" \ -" vmlinux\n" ); +die ("relocs [--abs-syms|--abs-relocs|--reloc-info|--text|--realmode|" \ +"--fg-kaslr] vmlinux\n" ); }int main (int argc,char **argv) {int show_absolute_syms, show_absolute_relocs, show_reloc_info; -int as_text, use_real_mode; +int as_text, use_real_mode, fgkaslr_opt;const char *fname;FILE *fp;int i;
@@ -30,6 +30,7 @@ int main(int argc, char **argv) show_reloc_info =0 ; as_text =0 ; use_real_mode =0 ; + fgkaslr_opt =0 ; fname =NULL ;for (i =1 ; i < argc; i++) {char *arg = argv[i];
@@ -54,6 +55,10 @@ int main(int argc, char **argv) use_real_mode =1 ;continue ; } +if (strcmp (arg,"--fg-kaslr" ) ==0 ) { + fgkaslr_opt =1 ; +continue ; + } }else if (!fname) { fname = arg;
@@ -75,11 +80,11 @@ int main(int argc, char **argv)if (e_ident[EI_CLASS ] ==ELFCLASS64 )process_64 (fp, use_real_mode, as_text, show_absolute_syms, show_absolute_relocs, - show_reloc_info); + show_reloc_info, fgkaslr_opt);else process_32 (fp, use_real_mode, as_text, show_absolute_syms, show_absolute_relocs, - show_reloc_info); + show_reloc_info, fgkaslr_opt);fclose (fp);return 0 ; }
Signature · 1 line
2.20.1
PATCH v4 7/10 x86/boot/compressed: Avoid duplicate malloc() implementations
In reply to Kristen Carlson AccardiFrom: Kees Cook <[email protected]>
The preboot malloc() (and free()) implementation in include/linux/decompress/mm.h (which is also included by the static decompressors) is static. This is fine when the only thing interested in using malloc() is the decompression code, but the x86 preboot environment uses malloc() in a couple places, leading to a potential collision when the static copies of the available memory region ("malloc_ptr") gets reset to the global "free_mem_ptr" value. As it happens, the existing usage pattern happened to be safe because each user did 1 malloc() and 1 free() before returning and were not nested:
extract_kernel() (misc.c)
choose_random_location() (kaslr.c) mem_avoid_init() handle_mem_options() malloc() ... free() ... parse_elf() (misc.c) malloc() ... free()
Adding FGKASLR, however, will insert additional malloc() calls local to fgkaslr.c in the middle of parse_elf()'s malloc()/free() pair:
parse_elf() (misc.c)
malloc()
if (...) {
layout_randomized_image(output, &ehdr, phdrs);
malloc() <- boom
...
else
layout_image(output, &ehdr, phdrs);
free()To avoid collisions, there must be a single implementation of malloc(). Adjust include/linux/decompress/mm.h so that visibility can be controlled, provide prototypes in misc.h, and implement the functions in misc.c. This also results in a small size savings:
$ size vmlinux.before vmlinux.after text data bss dec hex filename 8842314 468 178320 9021102 89a6ae vmlinux.before 8842240 468 178320 9021028 89a664 vmlinux.after
--- arch/x86/boot/compressed/kaslr.c | 4 ---- arch/x86/boot/compressed/misc.c | 3 +++ arch/x86/boot/compressed/misc.h | 2 ++ include/linux/decompress/mm.h | 12 ++++++++++-- 4 files changed, 15 insertions(+), 6 deletions(-)
arch/x86/boot/compressed/kaslr.c +0 -4
@@ -39,10 +39,6 @@#include <generated/utsrelease.h> #include <asm/efi.h> -/* Macros used by the included decompressor code below. */ -#define STATIC -#include <linux/decompress/mm.h> -#ifdef CONFIG_X86_5LEVEL unsigned int __pgtable_l5_enabled;unsigned int pgdir_shift__ro_after_init =39 ;
arch/x86/boot/compressed/misc.c +3 -0
@@ -28,6 +28,9 @@/* Macros used by the included decompressor code below. */ #define STATIC static +/* Define an externally visible malloc()/free(). */ +#define MALLOC_VISIBLE +#include <linux/decompress/mm.h> /* * Use normal definitions of mem*() from string.c. There are already
arch/x86/boot/compressed/misc.h +2 -0
@@ -39,6 +39,8 @@/* misc.c */ extern memptr free_mem_ptr;extern memptr free_mem_end_ptr; +extern void *malloc (int size); +extern void free (void *where);extern struct boot_params *boot_params;void __putstr (const char *s);void __puthex (unsigned long value);
include/linux/decompress/mm.h +10 -2
@@ -25,13 +25,21 @@#define STATIC_RW_DATA static#endif +/* +* When an architecture needs to share the malloc()/free() implementation +* between compilation units, it needs to have non-local visibility. +*/ +#ifndef MALLOC_VISIBLE +#define MALLOC_VISIBLE static +#endif +/* A trivial malloc implementation, adapted from * malloc by Hannu Savolainen 1993 and Matthias Urlichs 1994 */ STATIC_RW_DATA unsigned long malloc_ptr; STATIC_RW_DATA int malloc_count; -static void *malloc (int size) +MALLOC_VISIBLE void *malloc(int size) {void *p;
@@ -52,7 +60,7 @@ static void *malloc(int size)return p; } -static void free (void *where) +MALLOC_VISIBLE void free(void *where) { malloc_count--;if (!malloc_count)
Signature · 1 line
2.20.1
PATCH v4 8/10 x86: Add support for function granular KASLR
In reply to Kristen Carlson AccardiThis commit contains the changes required to re-layout the kernel text sections generated by -ffunction-sections shortly after decompression. Documentation of the feature is also added.
After decompression, the decompressed image's elf headers are parsed. In order to manually update certain data structures that are built with relative offsets during the kernel build process, certain symbols are not stripped by objdump and their location is retained in the elf symbol tables. These addresses are saved.
If the image was built with -ffunction-sections, there will be ELF section headers present which contain information about the address range of each section. Anything that is not broken out into function sections (i.e. is consolidated into .text) is left in it's original location, but any other executable section which begins with ".text." is located and shuffled randomly within the remaining text segment address range.
After the sections have been copied to their new locations, but before relocations have been applied, the kallsyms tables must be updated to reflect the new symbol locations. Because it is expected that these tables will be sorted by address, the kallsyms tables will need to be sorted after the update.
When applying relocations, the address of the relocation needs to be adjusted by the offset from the original location of the section that was randomized to it's new location. In addition, if a value at that relocation was a location in the text segment that was randomized, it's value will be adjusted to a new location.
After relocations have been applied, the exception table must be updated with with new symbol locations, and then re-sorted by the new address. The orc table will have been updated as part of applying relocations, but since it is expected to be sorted by address, it will need to be resorted.
--- .../admin-guide/kernel-parameters.txt | 7 + Documentation/security/fgkaslr.rst | 172 ++++ Documentation/security/index.rst | 1 + arch/x86/boot/compressed/Makefile | 2 + arch/x86/boot/compressed/fgkaslr.c | 811 ++++++++++++++++++ arch/x86/boot/compressed/misc.c | 154 +++- arch/x86/boot/compressed/misc.h | 28 + arch/x86/boot/compressed/utils.c | 11 + arch/x86/boot/compressed/vmlinux.symbols | 17 + arch/x86/include/asm/boot.h | 15 +- include/uapi/linux/elf.h | 1 + 11 files changed, 1191 insertions(+), 28 deletions(-) create mode 100644 Documentation/security/fgkaslr.rst create mode 100644 arch/x86/boot/compressed/fgkaslr.c create mode 100644 arch/x86/boot/compressed/utils.c create mode 100644 arch/x86/boot/compressed/vmlinux.symbols
Documentation/admin-guide/kernel-parameters.txt +7 -0
@@ -2082,6 +2082,13 @@ kernel and module base offset ASLR (Address Space Layout Randomization). + fgkaslr [KNL] + Format: { "off" } + When CONFIG_FG_KASLR is set, setting this parameter + to "off" disables kernel function granular ASLR + (Address Space Layout Randomization). + See Documentation/security/fgkaslr.rst. + kasan_multi_shot [KNL] Enforce KASAN (Kernel Address Sanitizer) to print report on every invalid memory access. Without this
Documentation/security/fgkaslr.rst new file +172 -0
172 lines not on this page · raw message
Documentation/security/index.rst +1 -0
@@ -7,6 +7,7 @@ Security Documentation credentials IMA-templates + fgkaslr keys/index lsm lsm-development
arch/x86/boot/compressed/Makefile +2 -0
@@ -82,6 +82,7 @@ vmlinux-objs-y := $(obj)/vmlinux.lds $(obj)/kernel_info.o $(obj)/head_$(BITS).o vmlinux-objs-$(CONFIG_EARLY_PRINTK) += $(obj)/early_serial_console.o vmlinux-objs-$(CONFIG_RANDOMIZE_BASE) += $(obj)/kaslr.o +vmlinux-objs-$(CONFIG_FG_KASLR) += $(obj)/utils.o $(obj)/fgkaslr.o ifdef CONFIG_X86_64 vmlinux-objs-$(CONFIG_RANDOMIZE_BASE) += $(obj)/kaslr_64.o vmlinux-objs-y += $(obj)/mem_encrypt.o
@@ -122,6 +123,7 @@ OBJCOPYFLAGS_vmlinux.bin := -R .comment -S ifdef CONFIG_FG_KASLR RELOCS_ARGS += --fg-kaslr + OBJCOPYFLAGS += --keep-symbols=$(srctree)/$(src)/vmlinux.symbols endif $(obj)/vmlinux.bin: vmlinux FORCE
arch/x86/boot/compressed/fgkaslr.c new file +811 -0
811 lines not on this page · raw message
arch/x86/boot/compressed/misc.c +128 -26
217 lines not on this page · raw message
arch/x86/boot/compressed/misc.h +28 -0
@@ -76,6 +76,34 @@ struct mem_vector {unsigned long long size; }; +#ifdef CONFIG_X86_64 +#define Elf_Ehdr Elf64_Ehdr +#define Elf_Phdr Elf64_Phdr +#define Elf_Shdr Elf64_Shdr +#else +#define Elf_Ehdr Elf32_Ehdr +#define Elf_Phdr Elf32_Phdr +#define Elf_Shdr Elf32_Shdr +#endif + +#if CONFIG_FG_KASLR +void layout_randomized_image (void *output,Elf_Ehdr *ehdr,Elf_Phdr *phdrs); +void pre_relocations_cleanup (unsigned long map); +void post_relocations_cleanup (unsigned long map); +Elf_Shdr *adjust_address (long *address); +void adjust_relative_offset (long pc,long *value,Elf_Shdr *section); +bool is_percpu_addr (long pc,long offset); +#else +static inline void layout_randomized_image (void *output,Elf_Ehdr *ehdr, +Elf_Phdr *phdrs) { } +static inline void pre_relocations_cleanup (unsigned long map) { } +static inline void post_relocations_cleanup (unsigned long map) { } +static inline Elf_Shdr *adjust_address (long *address) {return NULL ; } +static inline void adjust_relative_offset (long pc,long *value, +Elf_Shdr *section) { } +static inline bool is_percpu_addr (long pc,long offset) {return true; } +#endif /* CONFIG_FG_KASLR */ +#if CONFIG_RANDOMIZE_BASE /* kaslr.c */ void choose_random_location(unsigned long input,
arch/x86/boot/compressed/utils.c new file +11 -0
@@ -0,0 +1,11 @@ +// SPDX-License-Identifier: GPL-2.0 +/* +* utils.c +* +* This contains various libraries that are needed for fgkaslr +*/ +#define __DISABLE_EXPORTS +#define _LINUX_KPROBES_H +#define NOKPROBE_SYMBOL (fname) +#include "../../../../lib/sort.c" +#include "../../../../lib/bsearch.c"
arch/x86/boot/compressed/vmlinux.symbols new file +17 -0
@@ -0,0 +1,17 @@ +kallsyms_offsets +kallsyms_addresses +kallsyms_num_syms +kallsyms_relative_base +kallsyms_names +kallsyms_token_table +kallsyms_token_index +kallsyms_markers +__start___ex_table +__stop___ex_table +_sinittext +_einittext +_stext +_etext +__start_orc_unwind_ip +__stop_orc_unwind_ip +__start_orc_unwind
arch/x86/include/asm/boot.h +13 -2
@@ -26,8 +26,19 @@#ifdef CONFIG_KERNEL_BZIP2 # define BOOT_HEAP_SIZE 0x400000 -#else /* !CONFIG_KERNEL_BZIP2 */ -# define BOOT_HEAP_SIZE 0x10000 +#elif CONFIG_FG_KASLR +/* +* We need extra boot heap when using fgkaslr because we make a copy +* of the original decompressed kernel to avoid issues with writing +* over ourselves when shuffling the sections. We also need extra +* space for resorting kallsyms after shuffling. This value could +* be decreased if free() would release memory properly, or if we +* could avoid the kernel copy. It would need to be increased if we +* find additional tables that need to be resorted. +*/ +# define BOOT_HEAP_SIZE 0x4000000 +#else /* !CONFIG_KERNEL_BZIP2 && !CONFIG_FG_KASLR */ +# define BOOT_HEAP_SIZE 0x10000#endif #ifdef CONFIG_X86_64
include/uapi/linux/elf.h +1 -0
@@ -299,6 +299,7 @@ typedef struct elf64_phdr {#define SHN_LIVEPATCH 0xff20#define SHN_ABS 0xfff1#define SHN_COMMON 0xfff2 +#define SHN_XINDEX 0xffff#define SHN_HIRESERVE 0xffff typedef struct elf32_shdr {
Signature · 1 line
2.20.1
PATCH v4 9/10 kallsyms: Hide layout
In reply to Kristen Carlson AccardiThis patch makes /proc/kallsyms display in a random order, rather than sorted by address in order to hide the newly randomized address layout.
--- kernel/kallsyms.c | 163 +++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 162 insertions(+), 1 deletion(-)
kernel/kallsyms.c +162 -1
@@ -446,6 +446,12 @@ struct kallsym_iter {int show_value; }; +struct kallsyms_shuffled_iter { +struct kallsym_iter iter; +loff_t total_syms; +loff_t shuffled_index[]; +}; +int __weak arch_get_kallsym (unsigned int symnum,unsigned long *value,char *type,char *name) {
@@ -661,7 +667,7 @@ bool kallsyms_show_value(const struct cred *cred) } } -static int kallsyms_open (struct inode *inode,struct file *file) +static int __kallsyms_open (struct inode *inode,struct file *file) {/* * We keep iterator in m->private, since normal case is to
@@ -682,6 +688,161 @@ static int kallsyms_open(struct inode *inode, struct file *file)return 0 ; } +/* +* When function granular kaslr is enabled, we need to print out the symbols +* at random so we don't reveal the new layout. +*/ +#if defined(CONFIG_FG_KASLR ) +static int update_random_pos (struct kallsyms_shuffled_iter *s_iter, +loff_t pos,loff_t *new_pos) +{ +loff_t new; + +if (pos >= s_iter->total_syms) +return 0 ; + + new = s_iter->shuffled_index[pos]; + +/* +* normally this would be done as part of update_iter, however, +* we want to avoid triggering this in the event that new is +* zero since we don't want to blow away our pos end indicators. +*/ +if (new ==0 ) { + s_iter->iter.name[0 ] ='\0' ; + s_iter->iter.nameoff =get_symbol_offset (new); + s_iter->iter.pos = new; + } + + *new_pos = new; +return 1 ; +} + +static void *shuffled_start (struct seq_file *m,loff_t *pos) +{ +struct kallsyms_shuffled_iter *s_iter = m->private; +loff_t new_pos; + +if (!update_random_pos (s_iter, *pos, &new_pos)) +return NULL ; + +return s_start (m, &new_pos); +} + +static void *shuffled_next (struct seq_file *m,void *p,loff_t *pos) +{ +struct kallsyms_shuffled_iter *s_iter = m->private; +loff_t new_pos; + + (*pos)++; + +if (!update_random_pos (s_iter, *pos, &new_pos)) +return NULL ; + +if (!update_iter (m->private, new_pos)) +return NULL ; + +return p; +} + +/* +* shuffle_index_list() +* Use a Fisher Yates algorithm to shuffle a list of text sections. +*/ +static void shuffle_index_list (loff_t *indexes,loff_t size) +{ +int i; +unsigned int j; +loff_t temp; + +for (i = size -1 ; i >0 ; i--) { +/* pick a random index from 0 to i */ +get_random_bytes (&j,sizeof (j)); + j = j % (i +1 ); + + temp = indexes[i]; + indexes[i] = indexes[j]; + indexes[j] = temp; + } +} + +static const struct seq_operations kallsyms_shuffled_op = { + .start = shuffled_start, + .next = shuffled_next, + .stop = s_stop, + .show = s_show +}; + +static int kallsyms_random_open (struct inode *inode,struct file *file) +{ +loff_t pos; +struct kallsyms_shuffled_iter *shuffled_iter; +struct kallsym_iter iter; +bool show_value; + +/* +* If privileged, go ahead and use the normal algorithm for +* displaying symbols +*/ + show_value =kallsyms_show_value (file->f_cred); +if (show_value) +return __kallsyms_open (inode, file); + +/* +* we need to figure out how many extra symbols there are +* to print out past kallsyms_num_syms +*/ + pos = kallsyms_num_syms; +reset_iter (&iter,0 ); +do { +if (!update_iter (&iter, pos)) +break ; + pos++; + }while (1 ); + +/* +* add storage space for an array of loff_t equal to the size +* of the total number of symbols we need to print +*/ + shuffled_iter =__seq_open_private (file, &kallsyms_shuffled_op, +sizeof (*shuffled_iter) + + (sizeof (pos) * pos)); +if (!shuffled_iter) +return -ENOMEM ; + +reset_iter (&shuffled_iter->iter,0 ); + shuffled_iter->iter.show_value = show_value; + shuffled_iter->total_syms = pos; + +/* +* the existing update_iter algorithm requires that we +* are either moving along increasing pos sequentially, +* or that these values are correct. Since these values +* were discovered above, initialize our new iter so we +* can use update_iter non-sequentially. +*/ + shuffled_iter->iter.pos_arch_end = iter.pos_arch_end; + shuffled_iter->iter.pos_mod_end = iter.pos_mod_end; + shuffled_iter->iter.pos_ftrace_mod_end = iter.pos_ftrace_mod_end; + +/* +* initialize the array with all possible pos values, then +* shuffle the array so that the values will display in a random +* order. +*/ +for (pos =0 ; pos < shuffled_iter->total_syms; pos++) + shuffled_iter->shuffled_index[pos] = pos; + +shuffle_index_list (shuffled_iter->shuffled_index, shuffled_iter->total_syms); + +return 0 ; +} + +#define kallsyms_open kallsyms_random_open +#else +#define kallsyms_open __kallsyms_open +#endif /* CONFIG_FG_KASLR */ +#ifdef CONFIG_KGDB_KDB const char *kdb_walk_kallsyms (loff_t *pos) {
Signature · 1 line
2.20.1
Re: [PATCH v4 09/10] kallsyms: Hide layout
Quoted 3 lines · Kristen Carlson Accardi
This patch makes
/proc/kallsymsdisplay in a random order, rather than sorted by address in order to hide the newly randomized address layout.
Ah! Much nicer. Is there any reason not to just do this unconditionally, regardless of FGKASLR? It's a smallish dynamic allocation, and displaying kallsyms is hardly fast-path...
Quoted 139 lines
Signed-off-by Kristen Carlson Accardi <[email protected]>Reviewed-by Tony Luck <[email protected]>Tested-by Tony Luck <[email protected]>--- kernel/kallsyms.c | 163 +++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 162 insertions(+), 1 deletion(-)kernel/kallsyms.c +108
-1@@ -446,6 +446,12 @@ struct kallsym_iter {int show_value; }; +struct kallsyms_shuffled_iter { +struct kallsym_iter iter; +loff_t total_syms; +loff_t shuffled_index[]; +}; +int __weak arch_get_kallsym (unsigned int symnum,unsigned long *value,char *type,char *name) {@@ -661,7 +667,7 @@ bool kallsyms_show_value(const struct cred *cred) } } -static int kallsyms_open (struct inode *inode,struct file *file) +static int __kallsyms_open (struct inode *inode,struct file *file) {/* * We keep iterator in m->private, since normal case is to @@ -682,6 +688,161 @@ static int kallsyms_open(struct inode *inode, struct file *file)return 0 ; } +/* +* When function granular kaslr is enabled, we need to print out the symbols +* at random so we don't reveal the new layout. +*/ +#if defined(CONFIG_FG_KASLR ) +static int update_random_pos (struct kallsyms_shuffled_iter *s_iter, +loff_t pos,loff_t *new_pos) +{ +loff_t new; + +if (pos >= s_iter->total_syms) +return 0 ; + + new = s_iter->shuffled_index[pos]; + +/* +* normally this would be done as part of update_iter, however, +* we want to avoid triggering this in the event that new is +* zero since we don't want to blow away our pos end indicators. +*/ +if (new ==0 ) { + s_iter->iter.name[0 ] ='\0' ; + s_iter->iter.nameoff =get_symbol_offset (new); + s_iter->iter.pos = new; + } + + *new_pos = new; +return 1 ; +} + +static void *shuffled_start (struct seq_file *m,loff_t *pos) +{ +struct kallsyms_shuffled_iter *s_iter = m->private; +loff_t new_pos; + +if (!update_random_pos (s_iter, *pos, &new_pos)) +return NULL ; + +return s_start (m, &new_pos); +} + +static void *shuffled_next (struct seq_file *m,void *p,loff_t *pos) +{ +struct kallsyms_shuffled_iter *s_iter = m->private; +loff_t new_pos; + + (*pos)++; + +if (!update_random_pos (s_iter, *pos, &new_pos)) +return NULL ; + +if (!update_iter (m->private, new_pos)) +return NULL ; + +return p; +} + +/* +* shuffle_index_list() +* Use a Fisher Yates algorithm to shuffle a list of text sections. +*/ +static void shuffle_index_list (loff_t *indexes,loff_t size) +{ +int i; +unsigned int j; +loff_t temp; + +for (i = size -1 ; i >0 ; i--) { +/* pick a random index from 0 to i */ +get_random_bytes (&j,sizeof (j)); + j = j % (i +1 ); + + temp = indexes[i]; + indexes[i] = indexes[j]; + indexes[j] = temp; + } +} + +static const struct seq_operations kallsyms_shuffled_op = { + .start = shuffled_start, + .next = shuffled_next, + .stop = s_stop, + .show = s_show +}; + +static int kallsyms_random_open (struct inode *inode,struct file *file) +{ +loff_t pos; +struct kallsyms_shuffled_iter *shuffled_iter; +struct kallsym_iter iter; +bool show_value; + +/* +* If privileged, go ahead and use the normal algorithm for +* displaying symbols +*/ + show_value =kallsyms_show_value (file->f_cred); +if (show_value) +return __kallsyms_open (inode, file); + +/*
kernel/kallsyms.c static int kallsyms_open(struct inode *inode, struct file *file) · line 801
Quoted 10 lines
kernel/kallsyms.c +10
-0+* we need to figure out how many extra symbols there are +* to print out past kallsyms_num_syms +*/ + pos = kallsyms_num_syms; +reset_iter (&iter,0 ); +do { +if (!update_iter (&iter, pos)) +break ; + pos++; + }while (1 );
Can this be tracked separately instead of needing to search for it every time? (Looks like it's modules and ftrace? Could they each have a *_num_sysms?)
(I need to go read how kallsyms doesn't miscount in general when the symbol table changes out from under it...)
Signature · 1 line
Kees Cook
Re: [PATCH v4 09/10] kallsyms: Hide layout
Quoted 11 lines · Kees Cook
Quoted 4 lines · Kristen Carlson Accardi
This patch makes
/proc/kallsymsdisplay in a random order, rather than sorted by address in order to hide the newly randomized address
layout.Ah! Much nicer. Is there any reason not to just do this unconditionally,
regardless of FGKASLR? It's a smallish dynamic allocation, and displaying kallsyms is hardly fast-path...
My only concern would be whether or not there are scripts out there which assume the list would be ordered. If someone chooses to enable CONFIG_FG_KASLR, I think that it is reasonable to break those scripts. On the flip side, I don't know why it needs to come out of /proc/kallsyms in order, you can always just sort it after the fact if you need it sorted. It would make it more maintainable to not special case this. Hopefully a maintainer will comment on their preference. Another thing I do in this patch is continue to use the existing sorted by address functions if you are root. I didn't know if this was neccessary - it'd be nice if we could just do it the same way all the time. But I need some guidance here.
Quoted 162 lines
Quoted 162 lines
Signed-off-by Kristen Carlson Accardi <[email protected]>Reviewed-by Tony Luck <[email protected]>Tested-by Tony Luck <[email protected]>--- kernel/kallsyms.c | 163 +++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 162 insertions(+), 1 deletion(-)kernel/kallsyms.c +3
-0@@ -446,6 +446,12 @@ struct kallsym_iter {int show_value; }; +struct kallsyms_shuffled_iter { +struct kallsym_iter iter; +loff_t total_syms;Quoted 2 lines
(I need to go read how kallsyms doesn't miscount in general when
the
Quoted 3 lines
symbol table changes out from under it...)
kernel/kallsyms.c +3
-0+loff_t shuffled_index[]; +}; + int __weak arch_get_kallsym(unsigned int symnum, unsigned long*value,
kernel/kallsyms.c +1
-1char *type, char *name) {@@ -661,7 +667,7 @@ bool kallsyms_show_value(const struct cred *cred) } } -static int kallsyms_open (struct inode *inode,struct file *file) +static int __kallsyms_open (struct inode *inode,struct file *file) {/* kernel/kallsyms.c +2
-0* We keep iterator in m->private, since normal case is to @@ -682,6 +688,161 @@ static int kallsyms_open(struct inode *inode, struct file *file)return 0 ; } +/* +* When function granular kaslr is enabled, we need to print out the symbols
+ * at random so we don't reveal the new layout.
+ */kernel/kallsyms.c +2
-0+#if defined(CONFIG_FG_KASLR ) +static int update_random_pos(struct kallsyms_shuffled_iter
*s_iter,kernel/kallsyms.c +13
-0+ loff_t pos, loff_t *new_pos) +{ + loff_t new; + +if (pos >= s_iter->total_syms) +return 0 ; + + new = s_iter->shuffled_index[pos]; + +/* +* normally this would be done as part of update_iter, however, +* we want to avoid triggering this in the event that new is +* zero since we don't want to blow away our pos end indicators.
kernel/kallsyms.c +23
-0+*/ +if (new ==0 ) { + s_iter->iter.name[0 ] ='\0' ; + s_iter->iter.nameoff =get_symbol_offset (new); + s_iter->iter.pos = new; + } + + *new_pos = new; +return 1 ; +} + +static void *shuffled_start (struct seq_file *m,loff_t *pos) +{ +struct kallsyms_shuffled_iter *s_iter = m->private; +loff_t new_pos; + +if (!update_random_pos (s_iter, *pos, &new_pos)) +return NULL ; + +return s_start (m, &new_pos); +} + +static void *shuffled_next(struct seq_file *m, void *p, loff_t*pos)
kernel/kallsyms.c +18
-0+{ +struct kallsyms_shuffled_iter *s_iter = m->private; +loff_t new_pos; + + (*pos)++; + +if (!update_random_pos (s_iter, *pos, &new_pos)) +return NULL ; + +if (!update_iter (m->private, new_pos)) +return NULL ; + +return p; +} + +/* +* shuffle_index_list() +* Use a Fisher Yates algorithm to shuffle a list of text sections.
+ */kernel/kallsyms.c +25
-0+static void shuffle_index_list (loff_t *indexes,loff_t size) +{ +int i; +unsigned int j; +loff_t temp; + +for (i = size -1 ; i >0 ; i--) { +/* pick a random index from 0 to i */ +get_random_bytes (&j,sizeof (j)); + j = j % (i +1 ); + + temp = indexes[i]; + indexes[i] = indexes[j]; + indexes[j] = temp; + } +} + +static const struct seq_operations kallsyms_shuffled_op = { + .start = shuffled_start, + .next = shuffled_next, + .stop = s_stop, + .show = s_show +}; + +static int kallsyms_random_open(struct inode *inode, struct file*file)
kernel/kallsyms.c +22
-0+{ +loff_t pos; +struct kallsyms_shuffled_iter *shuffled_iter; +struct kallsym_iter iter; +bool show_value; + +/* +* If privileged, go ahead and use the normal algorithm for +* displaying symbols +*/ + show_value =kallsyms_show_value (file->f_cred); +if (show_value) +return __kallsyms_open (inode, file); + +/* +* we need to figure out how many extra symbols there are +* to print out past kallsyms_num_syms +*/ + pos = kallsyms_num_syms; +reset_iter (&iter,0 ); + do { + if (!update_iter(&iter, pos))
Quoted 8 lines
kernel/kallsyms.c static int kallsyms_open(struct inode *inode, struct file *file) · line 801
Quoted 3 lines
kernel/kallsyms.c +3
-0+break ; + pos++; + }while (1 );Can this be tracked separately instead of needing to search for it every
time? (Looks like it's modules and ftrace? Could they each have a*_num_sysms?)
It could, but I'd probably have to make more changes to those subsystems to keep this information there than I would to just do this search here. Because we start search at the end of the kernel core symbols, I don't think this search takes too many cycles to complete. On my system running a standard distro config the number of module and bpf symbols is not all that many, especially compared to the kernel core symbols.
PATCH v4 10/10 module: Reorder functions
In reply to Kristen Carlson AccardiIntroduce a new config option to allow modules to be re-ordered by function. This option can be enabled independently of the kernel text KASLR or FG_KASLR settings so that it can be used by architectures that do not support either of these features. This option will be selected by default if CONFIG_FG_KASLR is selected.
If a module has functions split out into separate text sections (i.e. compiled with the -ffunction-sections flag), reorder the functions to provide some code diversification to modules.
--- arch/x86/Makefile | 5 +++ init/Kconfig | 12 +++++++ kernel/kallsyms.c | 2 +- kernel/module.c | 81 +++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 99 insertions(+), 1 deletion(-)
arch/x86/Makefile +5 -0
@@ -51,6 +51,11 @@ ifdef CONFIG_X86_NEED_RELOCS LDFLAGS_vmlinux := --emit-relocs --discard-none endif +ifndef CONFIG_FG_KASLR + ifdef CONFIG_MODULE_FG_KASLR + KBUILD_CFLAGS_MODULE += -ffunction-sections + endif +endif # # Prevent GCC from generating any FP code by mistake. #
init/Kconfig +12 -0
@@ -1994,6 +1994,7 @@ config FG_KASLR bool "Function Granular Kernel Address Space Layout Randomization" depends on $(cc-option, -ffunction-sections) depends on ARCH_HAS_FG_KASLR + select MODULE_FG_KASLR default n help This option improves the randomness of the kernel text
@@ -2278,6 +2279,17 @@ config UNUSED_KSYMS_WHITELIST one per line. The path can be absolute, or relative to the kernel source tree. +config MODULE_FG_KASLR + depends on $(cc-option, -ffunction-sections) + bool "Module Function Granular Layout Randomization" + help + This option randomizes the module text section by reordering the text + section by function at module load time. In order to use this + feature, the module must have been compiled with the + -ffunction-sections compiler flag. + + If unsure, say N. + endif # MODULES config MODULES_TREE_LOOKUP
kernel/kallsyms.c +1 -1
@@ -692,7 +692,7 @@ static int __kallsyms_open(struct inode *inode, struct file *file)* When function granular kaslr is enabled, we need to print out the symbols * at random so we don't reveal the new layout. */ -#if defined(CONFIG_FG_KASLR ) +#if defined(CONFIG_FG_KASLR ) || defined(CONFIG_MODULE_FG_KASLR )static int update_random_pos (struct kallsyms_shuffled_iter *s_iter,loff_t pos,loff_t *new_pos) {
kernel/module.c +81 -0
99 lines not on this page · raw message
Signature · 1 line
2.20.1
Re: [PATCH v4 10/10] module: Reorder functions
+++ Kristen Carlson Accardi [17/07/20 10:00 -0700]:
Quoted 11 lines
Introduce a new config option to allow modules to be re-ordered by function. This option can be enabled independently of the kernel text KASLR or
FG_KASLRsettings so that it can be used by architectures that do not support either of these features. This option will be selected by default ifCONFIG_FG_KASLRis selected.If a module has functions split out into separate text sections (i.e. compiled with the -ffunction-sections flag), reorder the functions to provide some code diversification to modules.
Quoted 6 lines
Signed-off-by Kristen Carlson Accardi <[email protected]>Reviewed-by Kees Cook <[email protected]>Acked-by Ard Biesheuvel <[email protected]>Tested-by Ard Biesheuvel <[email protected]>Reviewed-by Tony Luck <[email protected]>Tested-by Tony Luck <[email protected]>
Hi Kristen!
I've boot tested this on x86, (un)loaded some modules, and checked their resulting section addresses as a quick sanity test. Feel free to add my:
Thank you!
Jessica
Miroslav Benes
maintainerLet me CC live-patching ML, because from a quick glance this is something which could impact live patching code. At least it invalidates assumptions which "sympos" is based on.
Miroslav
Quoted 7 lines · Kristen Carlson Accardi
Function Granular Kernel Address Space Layout Randomization (fgkaslr)
---------------------------------------------------------------------This patch set is an implementation of finer grained kernel address space randomization. It rearranges your kernel code at load time
on a per-function level granularity, with only around a second added to boot time.
[...]
Quoted 96 lines
Background
----------
KASLR was merged into the kernel with the objective of increasing the difficulty of code reuse attacks. Code reuse attacks reused existing code snippets to get around existing memory protections. They exploit software bugs which expose addresses of useful code snippets to control the flow of execution for their own nefarious purposes. KASLR moves the entire kernel code text as a unit at boot time in order to make addresses less predictable. The order of the code within the segment is unchanged - only the base address is shifted. There are a few shortcomings to this algorithm.1. Low Entropy - there are only so many locations the kernel can fit in. This means an attacker could guess without too much trouble.
2. Knowledge of a single address can reveal the offset of the base address, exposing all other locations for a published/known kernel image.
3. Info leaks abound.Finer grained ASLR has been proposed as a way to make ASLR more resistant to info leaks. It is not a new concept at all, and there are many variations possible. Function reordering is an implementation of finer grained ASLR which randomizes the layout of an address space on a function level granularity. We use the term "fgkaslr" in this document to refer to the technique of function reordering when used with KASLR, as well as finer grained KASLR in general.
Proposed Improvement
--------------------
This patch set proposes adding function reordering on top of the existing KASLR base address randomization. The over-arching objective is incremental improvement over what we already have. It is designed to work in combination with the existing solution. The implementation is really pretty simple, and there are 2 main area where changes occur:* Build time
GCC has had an option to place functions into individual .text sections for many years now. This option can be used to implement function reordering at load time. The final compiled vmlinux retains all the section headers, which can be used to help find the address ranges of each function. Using this information and an expanded table of relocation addresses, individual text sections can be suffled immediately after decompression. Some data tables inside the kernel that have assumptions about order require re-sorting after being updated when applying relocations. In order to modify these tables, a few key symbols are excluded from the objcopy symbol stripping process for use after shuffling the text segments.
Some highlights from the build time changes to look for:
The top level kernel
Makefilewas modified to add the gcc flag if it is supported. Currently, I am applying this flag to everything it is possible to randomize. Anything that is written in C and not present in a special input section is randomized. The final binary segment 0 retains a consolidated .text section, as well as all the individual .text.* sections. Future work could turn off this flags for selected files or even entire subsystems, although obviously at the cost of security.The relocs tool is updated to add relative relocations. This information previously wasn't included because it wasn't necessary when moving the entire .text segment as a unit.
A new file was created to contain a list of symbols that objcopy should keep. We use those symbols at load time as described below.
* Load time
The boot kernel was modified to parse the vmlinux elf file after decompression to check for our interesting symbols that we kept, and to look for any .text.* sections to randomize. The consolidated .text section is skipped and not moved. The sections are shuffled randomly, and copied into memory following the .text section in a new random order. The existing code which updated relocation addresses was modified to account for not just a fixed delta from the load address, but the offset that the function section was moved to. This requires inspection of each address to see if it was impacted by a randomization. We use a bsearch to make this less horrible on performance. Any tables that need to be modified with new addresses or resorted are updated using the symbol addresses parsed from the elf symbol table.
In order to hide our new layout, symbols reported through
/proc/kallsymswill be displayed in a random order.Security Considerations
-----------------------
The objective of this patch set is to improve a technology that is already merged into the kernel (KASLR). This code will not prevent all attacks, but should instead be considered as one of several tools that can be used. In particular, this code is meant to make KASLR more effective in the presence of info leaks.How much entropy we are adding to the existing entropy of standard KASLR will depend on a few variables. Firstly and most obviously, the number of functions that are randomized matters. This implementation keeps the existing .text section for code that cannot be randomized - for example, because it was assembly code. The less sections to randomize, the less entropy. In addition, due to alignment (16 bytes for
x86_64), the number of bits in a address that the attacker needs to guess is reduced, as the lower bits are identical.
[...]
Quoted 19 lines
Modules
-------
Modules are randomized similarly to the rest of the kernel by shuffling the sections at load time prior to moving them into memory. The module must also have been build with the -ffunction-sections compiler option.Although fgkaslr for the kernel is only supported for the
X86_64architecture, it is possible to use fgkaslr with modules on other architectures. To enable this feature, select
CONFIG_MODULE_FG_KASLR=yThis option is selected automatically for
X86_64whenCONFIG_FG_KASLRis set.Disabling
---------
Disabling normal KASLR using the nokaslr command line option also disables fgkaslr. It is also possible to disable fgkaslr separately by booting with fgkaslr=off on the commandline.
Quoted 3 lines · Miroslav Benes
Let me CC live-patching ML, because from a quick glance this is something which could impact live patching code. At least it invalidates assumptions which "sympos" is based on.
In a quick skim, it looks like the symbol resolution is using kallsyms_on_each_symbol(), so I think this is safe? What's a good selftest for live-patching?
Signature · 1 line
Kees Cook
Joe Lawrence
maintainerQuoted 9 lines · Kees Cook
Quoted 3 lines · Miroslav Benes
Let me CC live-patching ML, because from a quick glance this is something which could impact live patching code. At least it invalidates assumptions which "sympos" is based on.
In a quick skim, it looks like the symbol resolution is using
kallsyms_on_each_symbol(), so I think this is safe? What's a good selftest for live-patching?
Hi Kees,
I don't think any of the in-tree tests currently exercise the kallsyms/sympos end of livepatching.
I do have a local branch that does facilitate creating klp-relocations that do rely upon this feature -- I'll try to see if I can get those working with this patchset and report back later this week.
-- Joe
Joe Lawrence
maintainerQuoted 11 lines · Joe Lawrence
Quoted 9 lines · Kees Cook
Quoted 3 lines · Miroslav Benes
Let me CC live-patching ML, because from a quick glance this is something which could impact live patching code. At least it invalidates assumptions which "sympos" is based on.
In a quick skim, it looks like the symbol resolution is using
kallsyms_on_each_symbol(), so I think this is safe? What's a good selftest for live-patching?
Quoted 5 lines
Hi Kees,
I don't think any of the in-tree tests currently exercise the kallsyms/sympos end of livepatching.
On second thought, I mispoke.. The general livepatch code does use it:
klp_init_object
klp_init_object_loaded
klp_find_object_symbol
in which case any of the current kselftests should exercise that.
% make -C tools/testing/selftests/livepatch run_tests
-- Joe
Quoted 27 lines · Joe Lawrence
Quoted 13 lines · Joe Lawrence
Quoted 11 lines · Kees Cook
Quoted 5 lines · Miroslav Benes
Let me CC live-patching ML, because from a quick glance this is something
which could impact live patching code. At least it invalidates assumptions
which "sympos" is based on.In a quick skim, it looks like the symbol resolution is using
kallsyms_on_each_symbol(), so I think this is safe? What's a good selftest for live-patching?Quoted 5 lines
Hi Kees,
I don't think any of the in-tree tests currently exercise the kallsyms/sympos end of livepatching.
On second thought, I mispoke.. The general livepatch code does use it:
klp_init_object
klp_init_object_loaded
klp_find_object_symbol
Quoted 6 lines
in which case any of the current kselftests should exercise that.
% make -C
tools/testing/selftests/livepatchrun_tests-- Joe
Thanks, it looks like this should work for helping me exercise the live patch code paths. I will take a look and get back to you all.
Quoted 8 lines · Kees Cook
Quoted 3 lines · Miroslav Benes
Let me CC live-patching ML, because from a quick glance this is something which could impact live patching code. At least it invalidates assumptions which "sympos" is based on.
In a quick skim, it looks like the symbol resolution is using
kallsyms_on_each_symbol(), so I think this is safe? What's a good selftest for live-patching?
The problem is duplicate symbols. If there are two static functions named 'foo' then livepatch needs a way to distinguish them.
Our current approach to that problem is "sympos". We rely on the fact that the second foo() always comes after the first one in the symbol list and kallsyms. So they're referred to as foo,1 and foo,2.
Signature · 1 line
Josh
Quoted 10 lines · Josh Poimboeuf
Quoted 8 lines · Kees Cook
Quoted 3 lines · Miroslav Benes
Let me CC live-patching ML, because from a quick glance this is something which could impact live patching code. At least it invalidates assumptions which "sympos" is based on.
In a quick skim, it looks like the symbol resolution is using
kallsyms_on_each_symbol(), so I think this is safe? What's a good selftest for live-patching?
Quoted 6 lines
The problem is duplicate symbols. If there are two static functions named 'foo' then livepatch needs a way to distinguish them.
Our current approach to that problem is "sympos". We rely on the fact that the second
foo()always comes after the first one in the symbol list and kallsyms. So they're referred to as foo,1 and foo,2.
Ah. Fun. In that case, perhaps the LTO series has some solutions. I think builds with LTO end up renaming duplicate symbols like that, so it'll be back to being unique.
Signature · 1 line
Kees Cook
Quoted 23 lines · Kees Cook
Quoted 16 lines · Josh Poimboeuf
Quoted 10 lines · Kees Cook
Quoted 5 lines · Miroslav Benes
Let me CC live-patching ML, because from a quick glance this is something
which could impact live patching code. At least it invalidates assumptions
which "sympos" is based on.In a quick skim, it looks like the symbol resolution is using
kallsyms_on_each_symbol(), so I think this is safe? What's a good selftest for live-patching?The problem is duplicate symbols. If there are two static functions
named 'foo' then livepatch needs a way to distinguish them.Quoted 5 lines
Our current approach to that problem is "sympos". We rely on the fact
that the secondfoo()always comes after the first one in the symbol
list and kallsyms. So they're referred to as foo,1 and foo,2.
Quoted 4 lines
Ah. Fun. In that case, perhaps the LTO series has some solutions. I think builds with LTO end up renaming duplicate symbols like that, so it'll be back to being unique.
Well, glad to hear there might be some precendence for how to solve this, as I wasn't able to think of something reasonable off the top of my head. Are you speaking of the Clang LTO series?
https://lore.kernel.org/lkml/[email protected]/
Quoted 29 lines · Kristen Carlson Accardi
Quoted 23 lines · Kees Cook
Quoted 16 lines · Josh Poimboeuf
Quoted 10 lines · Kees Cook
Quoted 5 lines · Miroslav Benes
Let me CC live-patching ML, because from a quick glance this is something
which could impact live patching code. At least it invalidates assumptions
which "sympos" is based on.In a quick skim, it looks like the symbol resolution is using
kallsyms_on_each_symbol(), so I think this is safe? What's a good selftest for live-patching?The problem is duplicate symbols. If there are two static functions
named 'foo' then livepatch needs a way to distinguish them.Quoted 5 lines
Our current approach to that problem is "sympos". We rely on the fact
that the secondfoo()always comes after the first one in the symbol
list and kallsyms. So they're referred to as foo,1 and foo,2.Quoted 4 lines
Ah. Fun. In that case, perhaps the LTO series has some solutions. I think builds with LTO end up renaming duplicate symbols like that, so it'll be back to being unique.
Quoted 4 lines
Well, glad to hear there might be some precendence for how to solve this, as I wasn't able to think of something reasonable off the top of my head. Are you speaking of the Clang LTO series?
https://lore.kernel.org/lkml/[email protected]/
I'm not sure how LTO does it, but a few more (half-brained) ideas that could work:
1) Add a field in kallsyms to keep track of a symbol's original offset before randomization/re-sorting. Livepatch could use that field to determine the original sympos.
2) In fgkaslr code, go through all the sections and mark the ones which have duplicates (i.e. same name). Then when shuffling the sections, skip a shuffle if it involves a duplicate section. That way all the duplicates would retain their original sympos.
3) Livepatch could uniquely identify symbols by some feature other than sympos. For example:
Symbol/function size - obviously this would only work if duplicately named symbols have different sizes.
Checksum - as part of a separate feature we're also looking at giving each function its own checksum, calculated based on its instruction opcodes. Though calculating checksums at runtime could be complicated by IP-relative addressing.
I'm thinking #1 or #2 wouldn't be too bad. #3 might be harder.
Signature · 1 line
Josh
Quoted 70 lines · Josh Poimboeuf
Quoted 36 lines · Kristen Carlson Accardi
Quoted 28 lines · Kees Cook
Quoted 20 lines · Josh Poimboeuf
Quoted 10 lines · Kees Cook
Quoted 7 lines · Miroslav Benes
Let me CC live-patching ML, because from a quick glance this is
something
which could impact live patching code. At least it invalidates
assumptions
which "sympos" is based on.Quoted 4 lines
In a quick skim, it looks like the symbol resolution is using
kallsyms_on_each_symbol(), so I think this is safe? What's a good
selftest for live-patching?The problem is duplicate symbols. If there are two static functions
named 'foo' then livepatch needs a way to distinguish them.Quoted 6 lines
Our current approach to that problem is "sympos". We rely on the
fact
that the secondfoo()always comes after the first one in the symbol
list and kallsyms. So they're referred to as foo,1 and foo,2.Quoted 6 lines
Ah. Fun. In that case, perhaps the LTO series has some solutions. I
think builds with LTO end up renaming duplicate symbols like that, so
it'll be back to being unique.Quoted 5 lines
Well, glad to hear there might be some precendence for how to solve this, as I wasn't able to think of something reasonable off the top of
my head. Are you speaking of the Clang LTO series?
https://lore.kernel.org/lkml/[email protected]/I'm not sure how LTO does it, but a few more (half-brained) ideas that
could work:1) Add a field in kallsyms to keep track of a symbol's original offset
before randomization/re-sorting. Livepatch could use that field
to
determine the original sympos.2) In fgkaslr code, go through all the sections and mark the ones which
have duplicates (i.e. same name). Then when shuffling the
sections,
skip a shuffle if it involves a duplicate section. That way all
the
duplicates would retain their original sympos.3) Livepatch could uniquely identify symbols by some feature other than
sympos. For example:Symbol/function size - obviously this would only work if
duplicately
named symbols have different sizes.
Quoted 9 lines
Checksum - as part of a separate feature we're also looking at
giving
each function its own checksum, calculated based on its
instruction
opcodes. Though calculating checksums at runtime could be complicated by IP-relative addressing.I'm thinking #1 or #2 wouldn't be too bad. #3 might be harder.
Hi there! I was trying to find a super easy way to address this, so I thought the best thing would be if there were a compiler or linker switch to just eliminate any duplicate symbols at compile time for vmlinux. I filed this question on the binutils bugzilla looking to see if there were existing flags that might do this, but H.J. Lu went ahead and created a new one "-z unique", that seems to do what we would need it to do.
https://sourceware.org/bugzilla/show_bug.cgi?id=26391
When I use this option, it renames any duplicate symbols with an extension - for example duplicatefunc.1 or duplicatefunc.2. You could either match on the full unique name of the specific binary you are trying to patch, or you match the base name and use the extension to determine original position. Do you think this solution would work? If so, I can modify livepatch to refuse to patch on duplicated symbols if CONFIG_FG_KASLR and when this option is merged into the tool chain I can add it to KBUILD_LDFLAGS when CONFIG_FG_KASLR and livepatching should work in all cases.
Joe Lawrence
maintainerQuoted 89 lines · Kristen Carlson Accardi
Quoted 70 lines · Josh Poimboeuf
Quoted 36 lines · Kristen Carlson Accardi
Quoted 28 lines · Kees Cook
Quoted 20 lines · Josh Poimboeuf
Quoted 10 lines · Kees Cook
Quoted 7 lines · Miroslav Benes
Let me CC live-patching ML, because from a quick glance this is
something
which could impact live patching code. At least it invalidates
assumptions
which "sympos" is based on.Quoted 4 lines
In a quick skim, it looks like the symbol resolution is using
kallsyms_on_each_symbol(), so I think this is safe? What's a good
selftest for live-patching?The problem is duplicate symbols. If there are two static functions
named 'foo' then livepatch needs a way to distinguish them.Quoted 6 lines
Our current approach to that problem is "sympos". We rely on the
fact
that the secondfoo()always comes after the first one in the symbol
list and kallsyms. So they're referred to as foo,1 and foo,2.Quoted 6 lines
Ah. Fun. In that case, perhaps the LTO series has some solutions. I
think builds with LTO end up renaming duplicate symbols like that, so
it'll be back to being unique.Quoted 5 lines
Well, glad to hear there might be some precendence for how to solve this, as I wasn't able to think of something reasonable off the top of
my head. Are you speaking of the Clang LTO series?
https://lore.kernel.org/lkml/[email protected]/I'm not sure how LTO does it, but a few more (half-brained) ideas that
could work:1) Add a field in kallsyms to keep track of a symbol's original offset
before randomization/re-sorting. Livepatch could use that field
to
determine the original sympos.2) In fgkaslr code, go through all the sections and mark the ones which
have duplicates (i.e. same name). Then when shuffling the
sections,
skip a shuffle if it involves a duplicate section. That way all
the
duplicates would retain their original sympos.3) Livepatch could uniquely identify symbols by some feature other than
sympos. For example:Symbol/function size - obviously this would only work if
duplicately
named symbols have different sizes.Quoted 9 lines
Checksum - as part of a separate feature we're also looking at
giving
each function its own checksum, calculated based on its
instruction
opcodes. Though calculating checksums at runtime could be complicated by IP-relative addressing.I'm thinking #1 or #2 wouldn't be too bad. #3 might be harder.
Hi there! I was trying to find a super easy way to address this, so I thought the best thing would be if there were a compiler or linker switch to just eliminate any duplicate symbols at compile time for vmlinux. I filed this question on the binutils bugzilla looking to see if there were existing flags that might do this, but H.J. Lu went ahead and created a new one "-z unique", that seems to do what we would need it to do.
Quoted 4 lines
https://sourceware.org/bugzilla/show_bug.cgi?id=26391
When I use this option, it renames any duplicate symbols with an extension - for example duplicatefunc.1 or duplicatefunc.2.
I tried out H.J. Lu's branch and built some of the livepatch selftests with -z unique-symbol and indeed observe the following pattern:
foo, foo.1, foo.2, etc.
for homonym symbol names.
Quoted 4 lines
You could
either match on the full unique name of the specific binary you are trying to patch, or you match the base name and use the extension to determine original position. Do you think this solution would work?
I think it could work for klp-relocations.
As a quick test, I was able to hack the WIP klp-convert branch [1] to generate klp-relocations with the following hack:
const char *foo(void) __asm__("foo.1");when building foo's target with -z unique-symbol. (The target contained two static foo() functions.) The asm rename trick exercised the klp-convert implicit conversion feature, as the symbol was now uniquely named and included a non-valid C symbol character. User-defined klp-convert annotation support will require some refactoring, but shouldn't be too difficult to support as well.
Quoted 6 lines
If
so, I can modify livepatch to refuse to patch on duplicated symbols ifCONFIG_FG_KASLRand when this option is merged into the tool chain I can add it toKBUILD_LDFLAGSwhenCONFIG_FG_KASLRand livepatching should work in all cases.
I don't have a grasp on how complicated the alternatives might be, so I'll let others comment on best paths forward. I just wanted to note that -z unique-symbol looks like it could reasonable work well for this niche case.
[1] https://github.com/joe-lawrence/linux/tree/klp-convert-v5-expanded-v5.8 (not modified for -z unique-symbol, but noted for reference)
-- Joe
Miroslav Benes
maintainerLeaving Josh's proposals here for reference...
Quoted 44 lines
Quoted 26 lines
I'm not sure how LTO does it, but a few more (half-brained) ideas that
could work:1) Add a field in kallsyms to keep track of a symbol's original offset
before randomization/re-sorting. Livepatch could use that field
to
determine the original sympos.2) In fgkaslr code, go through all the sections and mark the ones which
have duplicates (i.e. same name). Then when shuffling the
sections,
skip a shuffle if it involves a duplicate section. That way all
the
duplicates would retain their original sympos.3) Livepatch could uniquely identify symbols by some feature other than
sympos. For example:Symbol/function size - obviously this would only work if
duplicately
named symbols have different sizes.Quoted 9 lines
Checksum - as part of a separate feature we're also looking at
giving
each function its own checksum, calculated based on its
instruction
opcodes. Though calculating checksums at runtime could be complicated by IP-relative addressing.I'm thinking #1 or #2 wouldn't be too bad. #3 might be harder.
Hi there! I was trying to find a super easy way to address this, so I thought the best thing would be if there were a compiler or linker switch to just eliminate any duplicate symbols at compile time for vmlinux. I filed this question on the binutils bugzilla looking to see if there were existing flags that might do this, but H.J. Lu went ahead and created a new one "-z unique", that seems to do what we would need it to do.
Quoted 7 lines
https://sourceware.org/bugzilla/show_bug.cgi?id=26391
When I use this option, it renames any duplicate symbols with an extension - for example duplicatefunc.1 or duplicatefunc.2. You could either match on the full unique name of the specific binary you are trying to patch, or you match the base name and use the extension to determine original position. Do you think this solution would work?
Yes, I think so (thanks, Joe, for testing!).
It looks cleaner to me than the options above, but it may just be a matter of taste. Anyway, I'd go with full name matching, because -z unique-symbol would allow us to remove sympos altogether, which is appealing.
Quoted 5 lines
If
so, I can modify livepatch to refuse to patch on duplicated symbols ifCONFIG_FG_KASLRand when this option is merged into the tool chain I can add it toKBUILD_LDFLAGSwhenCONFIG_FG_KASLRand livepatching should work in all cases.
Ok.
Josh, Petr, would this work for you too?
Thanks
Miroslav
Quoted 28 lines · Miroslav Benes
Quoted 8 lines
Hi there! I was trying to find a super easy way to address this, so I thought the best thing would be if there were a compiler or linker switch to just eliminate any duplicate symbols at compile time for vmlinux. I filed this question on the binutils bugzilla looking to see if there were existing flags that might do this, but H.J. Lu went ahead and created a new one "-z unique", that seems to do what we would need it to do.
Quoted 7 lines
https://sourceware.org/bugzilla/show_bug.cgi?id=26391
When I use this option, it renames any duplicate symbols with an extension - for example duplicatefunc.1 or duplicatefunc.2. You could either match on the full unique name of the specific binary you are trying to patch, or you match the base name and use the extension to determine original position. Do you think this solution would work?
Yes, I think so (thanks, Joe, for testing!).
It looks cleaner to me than the options above, but it may just be a matter of taste. Anyway, I'd go with full name matching, because -z unique-symbol would allow us to remove sympos altogether, which is appealing.
Quoted 5 lines
If
so, I can modify livepatch to refuse to patch on duplicated symbols ifCONFIG_FG_KASLRand when this option is merged into the tool chain I can add it toKBUILD_LDFLAGSwhenCONFIG_FG_KASLRand livepatching should work in all cases.
Quoted 3 lines
Ok.
Josh, Petr, would this work for you too?
Sounds good to me. Kristen, thanks for finding a solution!
Signature · 1 line
Josh
Quoted 29 lines · Josh Poimboeuf
Quoted 28 lines · Miroslav Benes
Quoted 8 lines
Hi there! I was trying to find a super easy way to address this, so I thought the best thing would be if there were a compiler or linker switch to just eliminate any duplicate symbols at compile time for vmlinux. I filed this question on the binutils bugzilla looking to see if there were existing flags that might do this, but H.J. Lu went ahead and created a new one "-z unique", that seems to do what we would need it to do.
Quoted 7 lines
https://sourceware.org/bugzilla/show_bug.cgi?id=26391
When I use this option, it renames any duplicate symbols with an extension - for example duplicatefunc.1 or duplicatefunc.2. You could either match on the full unique name of the specific binary you are trying to patch, or you match the base name and use the extension to determine original position. Do you think this solution would work?
Yes, I think so (thanks, Joe, for testing!).
It looks cleaner to me than the options above, but it may just be a matter of taste. Anyway, I'd go with full name matching, because -z unique-symbol would allow us to remove sympos altogether, which is appealing.
Quoted 5 lines
If
so, I can modify livepatch to refuse to patch on duplicated symbols ifCONFIG_FG_KASLRand when this option is merged into the tool chain I can add it toKBUILD_LDFLAGSwhenCONFIG_FG_KASLRand livepatching should work in all cases.
Quoted 5 lines
Quoted 3 lines
Ok.
Josh, Petr, would this work for you too?
Sounds good to me. Kristen, thanks for finding a solution!
(I am not subscribed. I came here via https://sourceware.org/bugzilla/show_bug.cgi?id=26391 (ld -z unique-symbol))
Quoted 7 lines
This works great after randomization because it always receives the current address at runtime rather than relying on any kind of buildtime address. The issue with with the live-patching code's algorithm for resolving duplicate symbol names. If they request a symbol by name from the kernel and there are 3 symbols with the same name, they use the symbol's position in the built binary image to select the correct symbol.
If a.o, b.o and c.o define local symbol 'foo'.
By position, do you mean that
* the live-patching code uses something like (findall("foo")[0], findall("foo")[1], findall("foo")[2]) ?
* shuffling a.o/b.o/c.o will make the returned triple different
Local symbols are not required to be unique. Instead of patching the toolchain, have you thought about making the live-patching code smarter?
(Depend on the duplicates, such a linker option can increase the link time/binary size considerably AND I don't know in what other cases such an option will be useful)
For the following example,
https://sourceware.org/bugzilla/show_bug.cgi?id=26822
# RUN: split-file %s %t
# RUN: gcc -c %t/a.s -o %t/a.o
# RUN: gcc -c %t/b.s -o %t/b.o
# RUN: gcc -c %t/c.s -o %t/c.o
# RUN: ld-new %t/a.o %t/b.o %t/c.o -z unique-symbol -o %t.exe
#--- a.s
a: a.1: a.2: nop
#--- b.s
a: nop
#--- c.s
a: nop
readelf -Ws output:
Symbol table '.symtab' contains 13 entries:
Num: Value Size Type Bind Vis Ndx Name
0: 0000000000000000 0 NOTYPE LOCAL DEFAULT UND
1: 0000000000000000 0 FILE LOCAL DEFAULT ABS a.o
2: 0000000000401000 0 NOTYPE LOCAL DEFAULT 1 a
3: 0000000000401000 0 NOTYPE LOCAL DEFAULT 1 a.1
4: 0000000000401000 0 NOTYPE LOCAL DEFAULT 1 a.2
5: 0000000000000000 0 FILE LOCAL DEFAULT ABS b.o
6: 0000000000401001 0 NOTYPE LOCAL DEFAULT 1 a.1
7: 0000000000000000 0 FILE LOCAL DEFAULT ABS c.o
8: 0000000000401002 0 NOTYPE LOCAL DEFAULT 1 a.2
9: 0000000000000000 0 NOTYPE GLOBAL DEFAULT UND _start
10: 0000000000402000 0 NOTYPE GLOBAL DEFAULT 1 __bss_start
11: 0000000000402000 0 NOTYPE GLOBAL DEFAULT 1 _edata
12: 0000000000402000 0 NOTYPE GLOBAL DEFAULT 1 _endNote that you have STT_FILE SHN_ABS symbols.
If the compiler does not produce them, they will be synthesized by GNU ld.
https://sourceware.org/bugzilla/show_bug.cgi?id=26822
ld.bfd copies non-STT_SECTION local symbols from input object files. If an object file does not have STT_FILE symbols (no .file directive) but has non-STT_SECTION local symbols, ld.bfd synthesizes a STT_FILE symbol
The filenames are usually base names, so "a.o" and "a.o" in two directories will be indistinguishable. The live-patching code can possibly work around this by not changing the relative order of the two "a.o".
Quoted 46 lines · Fangrui Song
Quoted 29 lines · Josh Poimboeuf
Quoted 28 lines · Miroslav Benes
Quoted 8 lines
Hi there! I was trying to find a super easy way to address this, so I thought the best thing would be if there were a compiler or linker switch to just eliminate any duplicate symbols at compile time for vmlinux. I filed this question on the binutils bugzilla looking to see if there were existing flags that might do this, but H.J. Lu went ahead and created a new one "-z unique", that seems to do what we would need it to do.
Quoted 7 lines
https://sourceware.org/bugzilla/show_bug.cgi?id=26391
When I use this option, it renames any duplicate symbols with an extension - for example duplicatefunc.1 or duplicatefunc.2. You could either match on the full unique name of the specific binary you are trying to patch, or you match the base name and use the extension to determine original position. Do you think this solution would work?
Yes, I think so (thanks, Joe, for testing!).
It looks cleaner to me than the options above, but it may just be a matter of taste. Anyway, I'd go with full name matching, because -z unique-symbol would allow us to remove sympos altogether, which is appealing.
Quoted 5 lines
If
so, I can modify livepatch to refuse to patch on duplicated symbols ifCONFIG_FG_KASLRand when this option is merged into the tool chain I can add it toKBUILD_LDFLAGSwhenCONFIG_FG_KASLRand livepatching should work in all cases.Quoted 5 lines
Quoted 3 lines
Ok.
Josh, Petr, would this work for you too?
Sounds good to me. Kristen, thanks for finding a solution!
(I am not subscribed. I came here via https://sourceware.org/bugzilla/show_bug.cgi?id=26391 (ld -z unique-symbol))
Quoted 7 lines
This works great after randomization because it always receives the current address at runtime rather than relying on any kind of buildtime address. The issue with with the live-patching code's algorithm for resolving duplicate symbol names. If they request a symbol by name from the kernel and there are 3 symbols with the same name, they use the symbol's position in the built binary image to select the correct symbol.
Quoted 4 lines
If a.o, b.o and c.o define local symbol 'foo'.
By position, do you mean that* the live-patching code uses something like (findall("foo")[0], findall("foo")[1], findall("foo")[2]) ?
Yes, it depends on their order in the symbol table of the linked binary (vmlinux).
Quoted 1 line
* shuffling
a.o/b.o/c.owill make the returned triple different
Yes, though it's actually functions that get shuffled.
Quoted 2 lines
Local symbols are not required to be unique. Instead of patching the toolchain, have you thought about making the live-patching code smarter?
It's a possibility (more on that below).
Quoted 1 line
(Depend on the duplicates, such a linker option can increase the link time/binary size considerably
Have you tried it on vmlinux? Just wondering what the time/size impact would be in real-world numbers.
Duplicate symbols make up a very small percentage of all symbols in the kernel, so I would think the binary size change (to the strtab?) would be insignificant?
Quoted 1 line
AND I don't know in what other cases such an option will be useful)
I believe some other kernel components (tracing, kprobes, bpf) have the same problem as livepatch with respect to disambiguating duplicate symbols, for the purposes of tracing/debugging. So I'm thinking it would be a nice overall improvement to the kernel.
Quoted 34 lines
For the following example,
https://sourceware.org/bugzilla/show_bug.cgi?id=26822
# RUN: split-file %s %t
# RUN: gcc -c %t/a.s -o %t/a.o
# RUN: gcc -c %t/b.s -o %t/b.o
# RUN: gcc -c %t/c.s -o %t/c.o
# RUN: ld-new %t/a.o %t/b.o %t/c.o -z unique-symbol -o %t.exe #--- a.s
a: a.1: a.2: nop
#--- b.s
a: nop
#--- c.s
a: nopreadelf -Ws output:
Symbol table '.symtab' contains 13 entries:
Num: Value Size Type Bind Vis Ndx Name 0: 0000000000000000 0 NOTYPE LOCAL DEFAULT UND 1: 0000000000000000 0 FILE LOCAL DEFAULT ABS a.o 2: 0000000000401000 0 NOTYPE LOCAL DEFAULT 1 a 3: 0000000000401000 0 NOTYPE LOCAL DEFAULT 1 a.1 4: 0000000000401000 0 NOTYPE LOCAL DEFAULT 1 a.2 5: 0000000000000000 0 FILE LOCAL DEFAULT ABS b.o 6: 0000000000401001 0 NOTYPE LOCAL DEFAULT 1 a.1 7: 0000000000000000 0 FILE LOCAL DEFAULT ABS c.o 8: 0000000000401002 0 NOTYPE LOCAL DEFAULT 1 a.2 9: 0000000000000000 0 NOTYPE GLOBAL DEFAULT UND _start 10: 0000000000402000 0 NOTYPE GLOBAL DEFAULT 1 __bss_start 11: 0000000000402000 0 NOTYPE GLOBAL DEFAULT 1 _edata 12: 0000000000402000 0 NOTYPE GLOBAL DEFAULT 1 _end
Quoted 7 lines
Note that you have
STT_FILESHN_ABSsymbols.
If the compiler does not produce them, they will be synthesized by GNU ld.https://sourceware.org/bugzilla/show_bug.cgi?id=26822
ld.bfd copies non-STT_SECTION local symbols from input object files. If an object file does not haveSTT_FILEsymbols (no .file directive) but has non-STT_SECTION local symbols, ld.bfd synthesizes aSTT_FILEsymbol
Right, I see what you're getting at. As far as I can tell, there are potentially two ways for fgkaslr to handle this:
a) shuffle files, not functions. i.e. keep the functions' order intact within the STT_FILE group, shuffling the file groups themselves.
(NOTE: this may have an additional benefit of improving i-cache performance, compared to the current fgkaslr implementation.)
or
b) shuffle functions, keeping track of what file they belonged to.
Maybe Kristen could comment on the feasibility of either of these options. I believe the STT_FILE symbols are not currently available to the kernel at runtime. They would need to be made available to both fgkaslr and livepatch code.
Overall "ld -z unique-symbol" would be much easier from a kernel standpoint, and would benefit multiple components as I mentioned above.
Quoted 3 lines
The filenames are usually base names, so "a.o" and "a.o" in two directories will be indistinguishable. The live-patching code can possibly work around this by not changing the relative order of the two "a.o".
Right, there are some file:func duplicates so this case would indeed need to be handled somehow.
$ readelf -s --wide vmlinux |awk '$4 == "FILE" {file=$8; next} $4 == "FUNC" {printf "%s:%s\n", file, $8}' |sort |uniq -d
bus.c:new_id_store
core.c:cmask_show
core.c:edge_show
core.c:event_show
core.c:inv_show
core.c:paravirt_read_msr
core.c:paravirt_read_msr_safe
core.c:type_show
core.c:umask_show
hid-core.c:hid_exit
hid-core.c:hid_init
inode.c:init_once
inode.c:remove_one
msr.c:msr_init
proc.c:c_next
proc.c:c_start
proc.c:c_stop
raw.c:dst_output
raw.c:raw_ioctl
route.c:dst_discard
super.c:init_once
udp.c:udp_lib_close
udp.c:udp_lib_hash
udp.c:udplite_getfrag
udplite.c:udp_lib_close
udplite.c:udp_lib_hash
udplite.c:udplite_sk_initSignature · 1 line
Josh
Hi,
Quoted 10 lines · Kristen Carlson Accardi
Quoted 8 lines
Function Granular Kernel Address Space Layout Randomization (fgkaslr)
---------------------------------------------------------------------This patch set is an implementation of finer grained kernel address space randomization. It rearranges your kernel code at load time
on a per-function level granularity, with only around a second added to boot time.
Quoted 7 lines
[...]
Quoted 5 lines
Modules
-------
Modules are randomized similarly to the rest of the kernel by shuffling the sections at load time prior to moving them into memory. The module must also have been build with the -ffunction-sections compiler option.
It seems, a couple more adjustments are needed in the module loader code.
With function granular KASLR, modules will have lots of ELF sections due to -ffunction-sections.
On my x86_64 system with kernel 5.8-rc7 with FG KASLR patches, for example, xfs.ko has 4849 ELF sections total, 2428 of these are loaded and shown in /sys/module/xfs/sections/.
There are at least 2 places where high-order memory allocations might happen during module loading. Such allocations may fail if memory is fragmented, while physically contiguous memory areas are not really needed there. I suggest to switch to kvmalloc/kvfree there.
1. kernel/module.c, randomize_text():
Elf_Shdr **text_list; ... int max_sections = info->hdr->e_shnum; ... text_list = kmalloc_array(max_sections, sizeof(*text_list), GFP_KERNEL);
The size of the allocated memory area is (8 * total_number_of_sections), if I understand it right, which is 38792 for xfs.ko, a 4th order allocation.
2. kernel/module.c, mod_sysfs_setup() => add_sect_attrs().
This allocation can be larger than the first one.
We found this issue with livepatch modules some time ago (these modules are already built with -ffunction-sections) [1], but, with FG KASLR, it affects all kernel modules. Large ones like xfs.ko, btrfs.ko, etc., could suffer the most from it.
When a module is loaded sysfs attributes are created for its ELF sections (visible as /sys/module/<module_name>/sections/*). and contain the start addresses of these ELF sections. A single memory chunk is allocated for all these:
size[0] = ALIGN(sizeof(*sect_attrs)
+ nloaded * sizeof(sect_attrs->attrs[0]),
sizeof(sect_attrs->grp.attrs[0]));
size[1] = (nloaded + 1) * sizeof(sect_attrs->grp.attrs[0]);
sect_attrs = kzalloc(size[0] + size[1], GFP_KERNEL);'nloaded' is the number of loaded ELF section in the module.
For the kernel 5.8-rc7 on my system, the total size is 56 + 72 * nloaded, which is 174872 for xfs.ko, 43 pages, 6th order allocation.
I enabled 'mm_page_alloc' tracepoint with filter 'order > 3' to confirm the issue and, indeed, got these two allocations when modprobe'ing xfs:
----------------------------/sys/kernel/debug/tracing/trace:
modprobe-1509 <...>: mm_page_alloc: <...> order=4
migratetype=0 gfp_flags=GFP_KERNEL|__GFP_COMP
modprobe-1509 <stack trace>
=> __alloc_pages_nodemask
=> alloc_pages_current
=> kmalloc_order
=> kmalloc_order_trace
=> __kmalloc
=> load_module
modprobe-1509 <...>: mm_page_alloc: <...> order=6 migratetype=0 gfp_flags=GFP_KERNEL|__GFP_COMP|__GFP_ZERO
modprobe-1509 <stack trace>
=> __alloc_pages_nodemask
=> alloc_pages_current
=> kmalloc_order
=> kmalloc_order_trace
=> __kmalloc
=> mod_sysfs_setup
=> load_module
----------------------------
I suppose, something like this can be used as workaround:
* for randomize_text():
-----------
kernel/module.c +2 -2
@@ -2433,7 +2433,7 @@ static void randomize_text(struct module *mod, struct load_info *info)if (sec ==0 )return ; - text_list =kmalloc_array (max_sections,sizeof (*text_list),GFP_KERNEL ); + text_list =kvmalloc_array (max_sections,sizeof (*text_list),GFP_KERNEL );if (!text_list)return ;
@@ -2466,7 +2466,7 @@ static void randomize_text(struct module *mod, struct load_info *info) shdr->sh_entsize =get_offset (mod, &size, shdr,0 ); } -kfree (text_list); +kvfree (text_list); }/* Lay out the SHF_ALLOC sections in a way not dissimilar to how ld
-----------
* for add_sect_attrs():
-----------
kernel/module.c +1 -1
@@ -1541,7 +1541,7 @@ static void free_sect_attrs(struct module_sect_attrs *sect_attrs)for (section =0 ; section < sect_attrs->nsections; section++)kfree (sect_attrs->attrs[section].battr.attr.name); -kfree (sect_attrs); +kvfree (sect_attrs); } static void add_sect_attrs(struct module *mod, const struct load_info
*info)
@@ -1558,7 +1558,7 @@ static void add_sect_attrs(struct module *mod, const struct load_info *info)
size[0] = ALIGN(struct_size(sect_attrs, attrs, nloaded),
sizeof(sect_attrs->grp.bin_attrs[0]));
size[1] = (nloaded + 1) * sizeof(sect_attrs->grp.bin_attrs[0]);
- sect_attrs = kzalloc(size[0] + size[1], GFP_KERNEL);
+ sect_attrs = kvzalloc(size[0] + size[1], GFP_KERNEL);
if (sect_attrs == NULL)
return;
-----------
[1] https://github.com/dynup/kpatch/pull/1131
Regards,
Evgenii
Quoted 4 lines · Evgenii Shatokhin
There are at least 2 places where high-order memory allocations might happen during module loading. Such allocations may fail if memory is fragmented, while physically contiguous memory areas are not really needed there. I suggest to switch to kvmalloc/kvfree there.
While this does seem to be the right solution for the extant problem, I do want to take a moment and ask if the function sections need to be exposed at all? What tools use this information, and do they just want to see the bounds of the code region? (i.e. the start/end of all the .text* sections) Perhaps .text.* could be excluded from the sysfs section list?
Signature · 1 line
Kees Cook
Joe Lawrence
maintainerQuoted 6 lines · Kees Cook
Quoted 4 lines · Evgenii Shatokhin
There are at least 2 places where high-order memory allocations might happen during module loading. Such allocations may fail if memory is fragmented, while physically contiguous memory areas are not really needed there. I suggest to switch to kvmalloc/kvfree there.
Quoted 7 lines
While this does seem to be the right solution for the extant problem, I do want to take a moment and ask if the function sections need to be exposed at all? What tools use this information, and do they just want to see the bounds of the code region? (i.e. the start/end of all the .text* sections) Perhaps .text.* could be excluded from the sysfs section list?
[[cc += FChE, see [0] for Evgenii's full mail ]]
It looks like debugging tools like systemtap [1], gdb [2] and its add-symbol-file cmd, etc. peek at the /sys/module/<MOD>/section/ info.
But yeah, it would be preferable if we didn't export a long sysfs representation if nobody actually needs it.
[0] https://lore.kernel.org/lkml/[email protected]/
[1] https://fossies.org/linux/systemtap/staprun/staprun.c
[2] https://www.oreilly.com/library/view/linux-device-drivers/0596005903/ch04.html#linuxdrive3-CHP-4-SECT-6.1
-- Joe
Hi -
Quoted 8 lines
Quoted 6 lines
While this does seem to be the right solution for the extant problem, I do want to take a moment and ask if the function sections need to be exposed at all? What tools use this information, and do they just want to see the bounds of the code region? (i.e. the start/end of all the .text* sections) Perhaps .text.* could be excluded from the sysfs section list?
[[cc += FChE, see [0] for Evgenii's full mail ]]
Thanks!
Quoted 4 lines
It looks like debugging tools like systemtap [1], gdb [2] and its add-symbol-file cmd, etc. peek at the /sys/module/<MOD>/section/ info. But yeah, it would be preferable if we didn't export a long sysfs representation if nobody actually needs it.
Systemtap needs to know base addresses of loaded text & data sections, in order to perform relocation of probe point PCs and context data addresses. It uses /sys/module/...., kind of under protest, because there seems to exist no MODULE_EXPORT'd API to get at that information some other way.
- FChE
Quoted 18 lines · Frank Ch. Eigler
Hi -
Quoted 8 lines
Quoted 6 lines
While this does seem to be the right solution for the extant problem, I do want to take a moment and ask if the function sections need to be exposed at all? What tools use this information, and do they just want to see the bounds of the code region? (i.e. the start/end of all the .text* sections) Perhaps .text.* could be excluded from the sysfs section list?
[[cc += FChE, see [0] for Evgenii's full mail ]]
Thanks!
Quoted 4 lines
It looks like debugging tools like systemtap [1], gdb [2] and its add-symbol-file cmd, etc. peek at the /sys/module/<MOD>/section/ info. But yeah, it would be preferable if we didn't export a long sysfs representation if nobody actually needs it.
Quoted 5 lines
Systemtap needs to know base addresses of loaded text & data sections, in order to perform relocation of probe point PCs and context data addresses. It uses
/sys/module/...., kind of under protest, because there seems to exist no MODULE_EXPORT'd API to get at that information some other way.
Wouldn't /proc/kallsysms entries cover this? I must be missing something...
Signature · 1 line
Kees Cook
Hi -
Quoted 9 lines · Kees Cook
[...]
Quoted 5 lines
Systemtap needs to know base addresses of loaded text & data sections, in order to perform relocation of probe point PCs and context data addresses. It uses
/sys/module/...., kind of under protest, because there seems to exist no MODULE_EXPORT'd API to get at that information some other way.Wouldn't
/proc/kallsysmsentries cover this? I must be missing something...
We have relocated based on sections, not some subset of function symbols accessible that way, partly because DWARF line- and DIE- based probes can map to addresses some way away from function symbols, into function interiors, or cloned/moved bits of optimized code. It would take some work to prove that function-symbol based heuristic arithmetic would have just as much reach.
- FChE
Quoted 13 lines · Frank Ch. Eigler
Hi -
Quoted 9 lines · Kees Cook
[...]
Quoted 5 lines
Systemtap needs to know base addresses of loaded text & data sections, in order to perform relocation of probe point PCs and context data addresses. It uses
/sys/module/...., kind of under protest, because there seems to exist no MODULE_EXPORT'd API to get at that information some other way.Wouldn't
/proc/kallsysmsentries cover this? I must be missing something...
Quoted 6 lines
We have relocated based on sections, not some subset of function symbols accessible that way, partly because DWARF line- and DIE- based probes can map to addresses some way away from function symbols, into function interiors, or cloned/moved bits of optimized code. It would take some work to prove that function-symbol based heuristic arithmetic would have just as much reach.
Interesting. Do you have an example handy? It seems like something like that would reference the enclosing section, which means we can't just leave them out of the sysfs list... (but if such things never happen in the function-sections, then we *can* remove them...)
Signature · 1 line
Kees Cook
Hi -
Quoted 8 lines
Quoted 6 lines
We have relocated based on sections, not some subset of function symbols accessible that way, partly because DWARF line- and DIE- based probes can map to addresses some way away from function symbols, into function interiors, or cloned/moved bits of optimized code. It would take some work to prove that function-symbol based heuristic arithmetic would have just as much reach.
Interesting. Do you have an example handy?
No, I'm afraid I don't have one that I know cannot possibly be expressed by reference to a function symbol only. I'd look at systemtap (4.3) probe point lists like:
% stap -vL 'kernel.statement("*@kernel/*verif*.c:*")' % stap -vL 'module("amdgpu").statement("*@*execution*.c:*")'
which give an impression of computed PC addresses.
Quoted 4 lines
It seems like something like that would reference the enclosing section, which means we can't just leave them out of the sysfs list... (but if such things never happen in the function-sections, then we *can* remove them...)
I'm not sure we can easily prove they can never happen there.
- FChE
+++ Joe Lawrence [03/08/20 14:17 -0400]:
Quoted 6 lines · Kees Cook
Quoted 5 lines · Evgenii Shatokhin
Quoted 4 lines
There are at least 2 places where high-order memory allocations might happen during module loading. Such allocations may fail if memory is fragmented, while physically contiguous memory areas are not really needed there. I suggest to switch to kvmalloc/kvfree there.
Thanks Evgenii for pointing out the potential memory allocation issues that may arise with very large modules when memory is fragmented. I was curious as to which modules on my machine would be considered large, and there seems to be quite a handful...(x86_64 with v5.8-rc6 with a relatively standard distro config and FG KASLR patches on top):
./amdgpu/sections 7277
./i915/sections 4267
./nouveau/sections 3772
./xfs/sections 2395
./btrfs/sections 1966
./mac80211/sections 1588
./kvm/sections 1468
./cfg80211/sections 1194
./drm/sections 1012
./bluetooth/sections 843
./iwlmvm/sections 664
./usbcore/sections 524
./videodev/sections 436
So, I agree with the suggestion that we could switch to kvmalloc() to try to mitigate potential allocation problems when memory is fragmented.
Quoted 7 lines
Quoted 6 lines
While this does seem to be the right solution for the extant problem, I do want to take a moment and ask if the function sections need to be exposed at all? What tools use this information, and do they just want to see the bounds of the code region? (i.e. the start/end of all the .text* sections) Perhaps .text.* could be excluded from the sysfs section list?
Quoted 5 lines
[[cc += FChE, see [0] for Evgenii's full mail ]]
It looks like debugging tools like systemtap [1], gdb [2] and its add-symbol-file cmd, etc. peek at the /sys/module/<MOD>/section/ info.
But yeah, it would be preferable if we didn't export a long sysfs representation if nobody actually needs it.
Thanks Joe for looking into this. Hmm, AFAICT for gdb it's not a hard dependency per se - for add-symbol-file I was under the impression that we are responsible for obtaining the relevant section addresses ourselves through /sys/module/ (the most oft cited method) and then feeding those to add-symbol-file. It would definitely be more difficult to find out the section addresses without the /sys/module/ section entries. In any case, it sounds like systemtap has a hard dependency on /sys/module/*/sections anyway.
Regarding /proc/kallsyms, I think it is probably possible to expose section symbols and their addresses via /proc/kallsyms rather than through sysfs (it would then live in the module's vmalloc'ed memory) but I'm not sure how helpful that would actually be, especially since existing tools depend on the sysfs interface being there.
Joe Lawrence
maintainerQuoted 295 lines · Kristen Carlson Accardi
Function Granular Kernel Address Space Layout Randomization (fgkaslr)
---------------------------------------------------------------------This patch set is an implementation of finer grained kernel address space randomization. It rearranges your kernel code at load time
on a per-function level granularity, with only around a second added to boot time.Changes in v4:
-------------
* dropped the patch to split out change to STATIC definition inx86/boot/compressed/misc.cand replaced with a patch authored by Kees Cook to avoid the duplicate malloc definitions
* Added a section toDocumentation/admin-guide/kernel-parameters.txtto document the fgkaslr boot option.
* redesigned the patch to hide the new layout when reading/proc/kallsyms. The previous implementation utilized a dynamically allocated linked list to display the kernel and module symbols in alphabetical order. The new implementation uses a randomly shuffled index array to display the kernel and module symbols in a random order.Changes in v3:
-------------
*Makefilechanges to accommodateCONFIG_LD_DEAD_CODE_DATA_ELIMINATION
* removal of extraneousALIGN_PAGEfrom_etextchanges
* changed variable names in x86/tools/relocs to be less confusing
* split out change to STATIC definition inx86/boot/compressed/misc.c
* Updates to Documentation to make it more clear what is preserved in .text
* much more detailed commit message for function granular KASLR patch
* minor tweaks and changes that make for more readable code
* this cover letter updated slightly to add additional detailsChanges in v2:
--------------
* Fix to address i386 build failure
* Allow module reordering patch to be configured separately so that arm (or other non-x86_64 arches) can take advantage of module function reordering. This support has not be tested by me, but smoke tested by Ard Biesheuvel <[email protected]> on arm.
* Fix build issue when building on arm as reported by
Ard Biesheuvel <[email protected]>Patches to objtool are included because they are dependencies for this patchset, however they have been submitted by their maintainer separately.
Background
----------
KASLR was merged into the kernel with the objective of increasing the difficulty of code reuse attacks. Code reuse attacks reused existing code snippets to get around existing memory protections. They exploit software bugs which expose addresses of useful code snippets to control the flow of execution for their own nefarious purposes. KASLR moves the entire kernel code text as a unit at boot time in order to make addresses less predictable. The order of the code within the segment is unchanged - only the base address is shifted. There are a few shortcomings to this algorithm.1. Low Entropy - there are only so many locations the kernel can fit in. This means an attacker could guess without too much trouble.
2. Knowledge of a single address can reveal the offset of the base address, exposing all other locations for a published/known kernel image.
3. Info leaks abound.Finer grained ASLR has been proposed as a way to make ASLR more resistant to info leaks. It is not a new concept at all, and there are many variations possible. Function reordering is an implementation of finer grained ASLR which randomizes the layout of an address space on a function level granularity. We use the term "fgkaslr" in this document to refer to the technique of function reordering when used with KASLR, as well as finer grained KASLR in general.
Proposed Improvement
--------------------
This patch set proposes adding function reordering on top of the existing KASLR base address randomization. The over-arching objective is incremental improvement over what we already have. It is designed to work in combination with the existing solution. The implementation is really pretty simple, and there are 2 main area where changes occur:* Build time
GCC has had an option to place functions into individual .text sections for many years now. This option can be used to implement function reordering at load time. The final compiled vmlinux retains all the section headers, which can be used to help find the address ranges of each function. Using this information and an expanded table of relocation addresses, individual text sections can be suffled immediately after decompression. Some data tables inside the kernel that have assumptions about order require re-sorting after being updated when applying relocations. In order to modify these tables, a few key symbols are excluded from the objcopy symbol stripping process for use after shuffling the text segments.
Some highlights from the build time changes to look for:
The top level kernel
Makefilewas modified to add the gcc flag if it is supported. Currently, I am applying this flag to everything it is possible to randomize. Anything that is written in C and not present in a special input section is randomized. The final binary segment 0 retains a consolidated .text section, as well as all the individual .text.* sections. Future work could turn off this flags for selected files or even entire subsystems, although obviously at the cost of security.The relocs tool is updated to add relative relocations. This information previously wasn't included because it wasn't necessary when moving the entire .text segment as a unit.
A new file was created to contain a list of symbols that objcopy should keep. We use those symbols at load time as described below.
* Load time
The boot kernel was modified to parse the vmlinux elf file after decompression to check for our interesting symbols that we kept, and to look for any .text.* sections to randomize. The consolidated .text section is skipped and not moved. The sections are shuffled randomly, and copied into memory following the .text section in a new random order. The existing code which updated relocation addresses was modified to account for not just a fixed delta from the load address, but the offset that the function section was moved to. This requires inspection of each address to see if it was impacted by a randomization. We use a bsearch to make this less horrible on performance. Any tables that need to be modified with new addresses or resorted are updated using the symbol addresses parsed from the elf symbol table.
In order to hide our new layout, symbols reported through
/proc/kallsymswill be displayed in a random order.Security Considerations
-----------------------
The objective of this patch set is to improve a technology that is already merged into the kernel (KASLR). This code will not prevent all attacks, but should instead be considered as one of several tools that can be used. In particular, this code is meant to make KASLR more effective in the presence of info leaks.How much entropy we are adding to the existing entropy of standard KASLR will depend on a few variables. Firstly and most obviously, the number of functions that are randomized matters. This implementation keeps the existing .text section for code that cannot be randomized - for example, because it was assembly code. The less sections to randomize, the less entropy. In addition, due to alignment (16 bytes for
x86_64), the number of bits in a address that the attacker needs to guess is reduced, as the lower bits are identical.Performance Impact
------------------
There are two areas where function reordering can impact performance: boot time latency, and run time performance.* Boot time latency
This implementation of finer grained KASLR impacts the boot time of the kernel in several places. It requires additional parsing of the kernel ELF file to obtain the section headers of the sections to be randomized. It calls the random number generator for each section to be randomized to determine that section's new memory location. It copies the decompressed kernel into a new area of memory to avoid corruption when laying out the newly randomized sections. It increases the number of relocations the kernel has to perform at boot time vs. standard KASLR, and it also requires a lookup on each address that needs to be relocated to see if it was in a randomized section and needs to be adjusted by a new offset. Finally, it re-sorts a few data tables that are required to be sorted by address.Booting a test VM on a modern, well appointed system showed an increase in latency of approximately 1 second.
* Run time
The performance impact at run-time of function reordering varies by workload. Using kcbench, a kernel compilation benchmark, the performance of a kernel build with finer grained KASLR was about 1% slower than a kernel with standard KASLR. Analysis with perf showed a slightly higher percentage of L1-icache-load-misses. Other workloads were examined as well, with varied results. Some workloads performed significantly worse under FGKASLR, while others stayed the same or were mysteriously better. In general, it will depend on the code flow whether or not finer grained KASLR will impact your workload, and how the underlying code was designed. Because the layout changes per boot, each time a system is rebooted the performance of a workload may change.Future work could identify hot areas that may not be randomized and either leave them in the .text section or group them together into a single section that may be randomized. If grouping things together helps, one other thing to consider is that if we could identify text blobs that should be grouped together to benefit a particular code flow, it could be interesting to explore whether this security feature could be also be used as a performance feature if you are interested in optimizing your kernel layout for a particular workload at boot time. Optimizing function layout for a particular workload has been researched and proven effective - for more information read the Facebook paper "Optimizing Function Placement for Large-Scale Data-Center Applications" (see references section below).
Image Size
----------
Adding additional section headers as a result of compiling with -ffunction-sections will increase the size of the vmlinux ELF file. With a standard distro config, the resulting vmlinux was increased by about 3%. The compressed image is also increased due to the header files, as well as the extra relocations that must be added. You can expect fgkaslr to increase the size of the compressed image by about 15%.Memory Usage
------------
fgkaslr increases the amount of heap that is required at boot time, although this extra memory is released when the kernel has finished decompression. As a result, it may not be appropriate to use this feature on systems without much memory.Building
--------
To enable fine grained KASLR, you need to have the following config options set (including all the ones you would use to build normal KASLR)
CONFIG_FG_KASLR=yIn addition, fgkaslr is only supported for the
X86_64architecture.Modules
-------
Modules are randomized similarly to the rest of the kernel by shuffling the sections at load time prior to moving them into memory. The module must also have been build with the -ffunction-sections compiler option.Although fgkaslr for the kernel is only supported for the
X86_64architecture, it is possible to use fgkaslr with modules on other architectures. To enable this feature, select
CONFIG_MODULE_FG_KASLR=yThis option is selected automatically for
X86_64whenCONFIG_FG_KASLRis set.Disabling
---------
Disabling normal KASLR using the nokaslr command line option also disables fgkaslr. It is also possible to disable fgkaslr separately by booting with fgkaslr=off on the commandline.References
----------
There are a lot of academic papers which explore finer grained ASLR. This paper in particular contributed the most to my implementation design as well as my overall understanding of the problem space:Selfrando: Securing the Tor Browser against De-anonymization Exploits, M. Conti, S. Crane, T. Frassetto, et al.
For more information on how function layout impacts performance, see:
Optimizing Function Placement for Large-Scale Data-Center Applications, G. Ottoni, B. Maher
Kees Cook (2):
x86/boot: Allow a "silent" kaslr random byte fetch x86/boot/compressed: Avoid duplicatemalloc()implementationsKristen Carlson Accardi (8):
objtool: Do not assume order of parent/child functions
x86:tools/relocs: Support >64K section headers
x86:Makefile: Add build and config option forCONFIG_FG_KASLR
x86: Make sure_etextincludes function sections x86/tools: Add relative relocs for randomized functions
x86: Add support for function granular KASLR
kallsyms: Hide layout
module: Reorder functions.../admin-guide/kernel-parameters.txt | 7 + Documentation/security/fgkaslr.rst | 172 ++++ Documentation/security/index.rst | 1 + Makefile | 6 +- arch/x86/Kconfig | 4 + arch/x86/Makefile | 5 + arch/x86/boot/compressed/Makefile | 9 +- arch/x86/boot/compressed/fgkaslr.c | 811 ++++++++++++++++++ arch/x86/boot/compressed/kaslr.c | 4 - arch/x86/boot/compressed/misc.c | 157 +++- arch/x86/boot/compressed/misc.h | 30 + arch/x86/boot/compressed/utils.c | 11 + arch/x86/boot/compressed/vmlinux.symbols | 17 + arch/x86/include/asm/boot.h | 15 +- arch/x86/kernel/vmlinux.lds.S | 17 +- arch/x86/lib/kaslr.c | 18 +- arch/x86/tools/relocs.c | 143 ++- arch/x86/tools/relocs.h | 4 +- arch/x86/tools/relocs_common.c | 15 +- include/asm-generic/vmlinux.lds.h | 18 +- include/linux/decompress/mm.h | 12 +- include/uapi/linux/elf.h | 1 + init/Kconfig | 26 + kernel/kallsyms.c | 163 +++- kernel/module.c | 81 ++ tools/objtool/elf.c | 8 +- 26 files changed, 1670 insertions(+), 85 deletions(-) create mode 100644 Documentation/security/fgkaslr.rst create mode 100644 arch/x86/boot/compressed/fgkaslr.c create mode 100644 arch/x86/boot/compressed/utils.c create mode 100644 arch/x86/boot/compressed/vmlinux.symbols
Quoted 4 lines
base-commit:
11ba468877bb23f28956a35e896356252d63c983Signature · 1 line
2.20.1
Apologies in advance if this has already been discussed elsewhere, but I did finally get around to testing the patchset against the livepatching kselftests.
The livepatching kselftests fail as all livepatches stall their transitions. It appears that reliable (ORC) stack unwinding is broken when fgkaslr is enabled.
Relevant config options:
CONFIG_ARCH_HAS_FG_KASLR=y
CONFIG_ARCH_STACKWALK=y
CONFIG_FG_KASLR=y
CONFIG_HAVE_LIVEPATCH=y
CONFIG_HAVE_RELIABLE_STACKTRACE=y
CONFIG_LIVEPATCH=y
CONFIG_MODULE_FG_KASLR=y
CONFIG_TEST_LIVEPATCH=m
CONFIG_UNWINDER_ORC=y
The livepatch transitions are stuck along this call path:
klp_check_stack
stack_trace_save_tsk_reliable
arch_stack_walk_reliable
/* Check for stack corruption */
if (unwind_error(&state))
return -EINVAL;where the unwinder error is set by unwind_next_frame():
arch/x86/kernel/unwind_orc.c
bool unwind_next_frame(struct unwind_state *state)
sometimes here:
/* End-of-stack check for kernel threads: */
if (orc->sp_reg == ORC_REG_UNDEFINED) {
if (!orc->end)
goto err;
goto the_end;
}or here:
/* Prevent a recursive loop due to bad ORC data: */
if (state->stack_info.type == prev_type &&
on_stack(&state->stack_info, (void *)state->sp, sizeof(long)) &&
state->sp <= prev_sp) {
orc_warn_current("stack going in the wrong direction? at %pB\n",
(void *)orig_ip);
goto err;
}(and probably other places the ORC unwinder gets confused.)
It also manifests itself in other, more visible ways. For example, a kernel module that calls dump_stack() in its init function or even /proc/<pid>/stack:
(fgkaslr on)
------------
Call Trace: ? dump_stack+0x57/0x73 ? 0xffffffffc0850000 ? mymodule_init+0xa/0x1000 [dumpstack] ? do_one_initcall+0x46/0x1f0 ? free_unref_page_commit+0x91/0x100 ? _cond_resched+0x15/0x30 ? kmem_cache_alloc_trace+0x14b/0x210 ? do_init_module+0x5a/0x220 ? load_module+0x1912/0x1b20 ? __do_sys_finit_module+0xa8/0x110 ? __do_sys_finit_module+0xa8/0x110 ? do_syscall_64+0x47/0x80 ? entry_SYSCALL_64_after_hwframe+0x44/0xa9
% sudo cat /proc/$$/stack
[<0>] do_wait+0x1c3/0x230 [<0>] kernel_wait4+0xa6/0x140
fgkaslr=off
-----------
Call Trace: dump_stack+0x57/0x73 ? 0xffffffffc04f2000 mymodule_init+0xa/0x1000 [readonly] do_one_initcall+0x46/0x1f0 ? free_unref_page_commit+0x91/0x100 ? _cond_resched+0x15/0x30 ? kmem_cache_alloc_trace+0x14b/0x210 do_init_module+0x5a/0x220 load_module+0x1912/0x1b20 ? __do_sys_finit_module+0xa8/0x110 __do_sys_finit_module+0xa8/0x110 do_syscall_64+0x47/0x80 entry_SYSCALL_64_after_hwframe+0x44/0xa9
% sudo cat /proc/$$/stack
[<0>] do_wait+0x1c3/0x230 [<0>] kernel_wait4+0xa6/0x140 [<0>] __do_sys_wait4+0x83/0x90 [<0>] do_syscall_64+0x47/0x80 [<0>] entry_SYSCALL_64_after_hwframe+0x44/0xa9
I would think fixing and verifying these latter cases would be easier than chasing livepatch transitions (but would still probably fix klp case, too). Perhaps Josh or someone has other ORC unwinder tests that could be used?
-- Joe
Quoted 550 lines · Joe Lawrence
Quoted 415 lines · Kristen Carlson Accardi
Function Granular Kernel Address Space Layout Randomization (fgkaslr)
-----------------------------------------------------------------
----This patch set is an implementation of finer grained kernel address space
randomization. It rearranges your kernel code at load time on a per-function level granularity, with only around a second added to
boot time.Changes in v4:
-------------
* dropped the patch to split out change to STATIC definition inx86/boot/compressed/misc.cand replaced with a patch authored by Kees Cook to avoid the duplicate malloc definitions
* Added a section toDocumentation/admin-guide/kernel-parameters.txt
to document the fgkaslr boot option.
* redesigned the patch to hide the new layout when reading/proc/kallsyms. The previous implementation utilized a
dynamically
allocated linked list to display the kernel and module symbols in alphabetical order. The new implementation uses a randomly shuffled index array to display the kernel and module symbols in a random order.Changes in v3:
-------------
*Makefilechanges to accommodateCONFIG_LD_DEAD_CODE_DATA_ELIMINATION
* removal of extraneousALIGN_PAGEfrom_etextchanges
* changed variable names in x86/tools/relocs to be less confusing
* split out change to STATIC definition inx86/boot/compressed/misc.c
* Updates to Documentation to make it more clear what is preserved in .text
* much more detailed commit message for function granular KASLR patch
* minor tweaks and changes that make for more readable code
* this cover letter updated slightly to add additional detailsChanges in v2:
--------------
* Fix to address i386 build failure
* Allow module reordering patch to be configured separately so that arm (or other non-x86_64 arches) can take advantage of module
function
reordering. This support has not be tested by me, but smoke
tested by
Ard Biesheuvel <[email protected]> on arm.
* Fix build issue when building on arm as reported by Ard Biesheuvel <[email protected]>Patches to objtool are included because they are dependencies for this
patchset, however they have been submitted by their maintainer separately.Background
----------
KASLR was merged into the kernel with the objective of increasing the
difficulty of code reuse attacks. Code reuse attacks reused existing code
snippets to get around existing memory protections. They exploit software bugs
which expose addresses of useful code snippets to control the flow of
execution for their own nefarious purposes. KASLR moves the entire kernel
code text as a unit at boot time in order to make addresses less predictable.
The order of the code within the segment is unchanged - only the base address
is shifted. There are a few shortcomings to this algorithm.1. Low Entropy - there are only so many locations the kernel can fit in. This
means an attacker could guess without too much trouble.
2. Knowledge of a single address can reveal the offset of the base address,
exposing all other locations for a published/known kernel image.
3. Info leaks abound.Finer grained ASLR has been proposed as a way to make ASLR more resistant
to info leaks. It is not a new concept at all, and there are many variations
possible. Function reordering is an implementation of finer grained ASLR
which randomizes the layout of an address space on a function level granularity. We use the term "fgkaslr" in this document to refer to the
technique of function reordering when used with KASLR, as well as finer grained
KASLR in general.Proposed Improvement
--------------------
This patch set proposes adding function reordering on top of the existing
KASLR base address randomization. The over-arching objective is incremental
improvement over what we already have. It is designed to work in combination
with the existing solution. The implementation is really pretty simple, and
there are 2 main area where changes occur:* Build time
GCC has had an option to place functions into individual .text sections for
many years now. This option can be used to implement function reordering at
load time. The final compiled vmlinux retains all the section headers, which
can be used to help find the address ranges of each function. Using this
information and an expanded table of relocation addresses, individual text
sections can be suffled immediately after decompression. Some data tables
inside the kernel that have assumptions about order require re- sorting
after being updated when applying relocations. In order to modify these tables,
a few key symbols are excluded from the objcopy symbol stripping process for
use after shuffling the text segments.Some highlights from the build time changes to look for:
The top level kernel
Makefilewas modified to add the gcc flag if it
is supported. Currently, I am applying this flag to everything it is
possible to randomize. Anything that is written in C and not present in a
special input section is randomized. The final binary segment 0 retains a
consolidated .text section, as well as all the individual .text.* sections.
Future work could turn off this flags for selected files or even entire
subsystems, although obviously at the cost of security.The relocs tool is updated to add relative relocations. This information
previously wasn't included because it wasn't necessary when moving the
entire .text segment as a unit.A new file was created to contain a list of symbols that objcopy should
keep. We use those symbols at load time as described below.* Load time
The boot kernel was modified to parse the vmlinux elf file after decompression to check for our interesting symbols that we kept, and to
look for any .text.* sections to randomize. The consolidated .text section
is skipped and not moved. The sections are shuffled randomly, and copied
into memory following the .text section in a new random order. The existing
code which updated relocation addresses was modified to account for not just a fixed delta from the load address, but the offset that the function
section was moved to. This requires inspection of each address to see if
it was impacted by a randomization. We use a bsearch to make this less
horrible on performance. Any tables that need to be modified with new
addresses or resorted are updated using the symbol addresses parsed from the
elf symbol table.In order to hide our new layout, symbols reported through
/proc/kallsyms
will be displayed in a random order.Security Considerations
-----------------------
The objective of this patch set is to improve a technology that is already
merged into the kernel (KASLR). This code will not prevent all attacks,
but should instead be considered as one of several tools that can be used.
In particular, this code is meant to make KASLR more effective in the presence
of info leaks.How much entropy we are adding to the existing entropy of standard KASLR will
depend on a few variables. Firstly and most obviously, the number of functions
that are randomized matters. This implementation keeps the existing .text
section for code that cannot be randomized - for example, because it was
assembly code. The less sections to randomize, the less entropy. In addition,
due to alignment (16 bytes forx86_64), the number of bits in a address that
the attacker needs to guess is reduced, as the lower bits are identical.Performance Impact
------------------
There are two areas where function reordering can impact
performance: boot
time latency, and run time performance.* Boot time latency
This implementation of finer grained KASLR impacts the boot time of the kernel
in several places. It requires additional parsing of the kernel ELF file to
obtain the section headers of the sections to be randomized. It calls the
random number generator for each section to be randomized to determine that
section's new memory location. It copies the decompressed kernel into a new
area of memory to avoid corruption when laying out the newly randomized
sections. It increases the number of relocations the kernel has to perform at
boot time vs. standard KASLR, and it also requires a lookup on each address
that needs to be relocated to see if it was in a randomized section and needs
to be adjusted by a new offset. Finally, it re-sorts a few data tables that
are required to be sorted by address.Booting a test VM on a modern, well appointed system showed an increase in
latency of approximately 1 second.* Run time
The performance impact at run-time of function reordering varies by workload.
Using kcbench, a kernel compilation benchmark, the performance of a kernel
build with finer grained KASLR was about 1% slower than a kernel with standard
KASLR. Analysis with perf showed a slightly higher percentage of L1-icache-load-misses. Other workloads were examined as well, with varied
results. Some workloads performed significantly worse under FGKASLR, while
others stayed the same or were mysteriously better. In general, it will
depend on the code flow whether or not finer grained KASLR will impact
your workload, and how the underlying code was designed. Because the layout
changes per boot, each time a system is rebooted the performance of a workload
may change.Future work could identify hot areas that may not be randomized and either
leave them in the .text section or group them together into a single section
that may be randomized. If grouping things together helps, one other thing to
consider is that if we could identify text blobs that should be grouped together
to benefit a particular code flow, it could be interesting to explore
whether this security feature could be also be used as a performance
feature if you are interested in optimizing your kernel layout for a
particular workload at boot time. Optimizing function layout for a particular
workload has been researched and proven effective - for more information
read the Facebook paper "Optimizing Function Placement for Large- Scale
Data-Center Applications" (see references section below).Image Size
----------
Adding additional section headers as a result of compiling with -ffunction-sections will increase the size of the vmlinux ELF file. With a standard distro config, the resulting vmlinux was increased by
about 3%. The compressed image is also increased due to the header files,
as well as the extra relocations that must be added. You can expect fgkaslr
to increase the size of the compressed image by about 15%.Memory Usage
------------
fgkaslr increases the amount of heap that is required at boot time, although this extra memory is released when the kernel has finished decompression. As a result, it may not be appropriate to use this feature on
systems without much memory.Building
--------
To enable fine grained KASLR, you need to have the following config options
set (including all the ones you would use to build normal KASLR)
CONFIG_FG_KASLR=yIn addition, fgkaslr is only supported for the
X86_64architecture.Modules
-------
Modules are randomized similarly to the rest of the kernel by shuffling
the sections at load time prior to moving them into memory. The module must
also have been build with the -ffunction-sections compiler option.Although fgkaslr for the kernel is only supported for the
X86_64architecture,
it is possible to use fgkaslr with modules on other architectures. To enable
this feature, select
CONFIG_MODULE_FG_KASLR=yThis option is selected automatically for
X86_64whenCONFIG_FG_KASLRis set.Disabling
---------
Disabling normal KASLR using the nokaslr command line option also disables
fgkaslr. It is also possible to disable fgkaslr separately by booting with
fgkaslr=off on the commandline.References
----------
There are a lot of academic papers which explore finer grained ASLR.
This paper in particular contributed the most to my implementation design
as well as my overall understanding of the problem space:Selfrando: Securing the Tor Browser against De-anonymization Exploits,
M. Conti, S. Crane, T. Frassetto, et al.For more information on how function layout impacts performance, see:
Optimizing Function Placement for Large-Scale Data-Center Applications,
G. Ottoni, B. MaherKees Cook (2):
x86/boot: Allow a "silent" kaslr random byte fetch x86/boot/compressed: Avoid duplicatemalloc()implementationsKristen Carlson Accardi (8):
objtool: Do not assume order of parent/child functions
x86:tools/relocs: Support >64K section headers
x86:Makefile: Add build and config option forCONFIG_FG_KASLR
x86: Make sure_etextincludes function sections x86/tools: Add relative relocs for randomized functions
x86: Add support for function granular KASLR
kallsyms: Hide layout
module: Reorder functions.../admin-guide/kernel-parameters.txt | 7 + Documentation/security/fgkaslr.rst | 172 ++++ Documentation/security/index.rst | 1 + Makefile | 6 +- arch/x86/Kconfig | 4 + arch/x86/Makefile | 5 + arch/x86/boot/compressed/Makefile | 9 +- arch/x86/boot/compressed/fgkaslr.c | 811 ++++++++++++++++++ arch/x86/boot/compressed/kaslr.c | 4 - arch/x86/boot/compressed/misc.c | 157 +++- arch/x86/boot/compressed/misc.h | 30 + arch/x86/boot/compressed/utils.c | 11 + arch/x86/boot/compressed/vmlinux.symbols | 17 + arch/x86/include/asm/boot.h | 15 +- arch/x86/kernel/vmlinux.lds.S | 17 +- arch/x86/lib/kaslr.c | 18 +- arch/x86/tools/relocs.c | 143 ++- arch/x86/tools/relocs.h | 4 +- arch/x86/tools/relocs_common.c | 15 +- include/asm-generic/vmlinux.lds.h | 18 +- include/linux/decompress/mm.h | 12 +- include/uapi/linux/elf.h | 1 + init/Kconfig | 26 + kernel/kallsyms.c | 163 +++- kernel/module.c | 81 ++ tools/objtool/elf.c | 8 +- 26 files changed, 1670 insertions(+), 85 deletions(-) create mode 100644 Documentation/security/fgkaslr.rst create mode 100644 arch/x86/boot/compressed/fgkaslr.c create mode 100644 arch/x86/boot/compressed/utils.c create mode 100644 arch/x86/boot/compressed/vmlinux.symbolsQuoted 4 lines
base-commit:
11ba468877bb23f28956a35e896356252d63c983Signature · 1 line
2.20.1Apologies in advance if this has already been discussed elsewhere, but I
did finally get around to testing the patchset against the livepatching
kselftests.The livepatching kselftests fail as all livepatches stall their transitions. It appears that reliable (ORC) stack unwinding is broken
when fgkaslr is enabled.Relevant config options:
CONFIG_ARCH_HAS_FG_KASLR=y
CONFIG_ARCH_STACKWALK=y
CONFIG_FG_KASLR=y
CONFIG_HAVE_LIVEPATCH=y
CONFIG_HAVE_RELIABLE_STACKTRACE=y
CONFIG_LIVEPATCH=y
CONFIG_MODULE_FG_KASLR=y
CONFIG_TEST_LIVEPATCH=m
CONFIG_UNWINDER_ORC=yThe livepatch transitions are stuck along this call path:
klp_check_stackstack_trace_save_tsk_reliable arch_stack_walk_reliable /* Check for stack corruption */ if (unwind_error(&state)) return -EINVAL;where the unwinder error is set by
unwind_next_frame():
arch/x86/kernel/unwind_orc.c
boolunwind_next_frame(struct unwind_state *state)sometimes here:
/* End-of-stack check for kernel threads: */ if (orc->sp_reg == ORC_REG_UNDEFINED) { if (!orc->end) goto err; goto the_end; }or here:
/* Prevent a recursive loop due to bad ORC data:
*/if (
state->stack_info.type==prev_type
&&on_stack(&state->stack_info, (void *)state->sp,
sizeof(long))
&&
state->sp<=prev_sp)
{orc_warn_current("stack going in the wrong direction?
at %pB\n",
(void
*)orig_ip);goto
err;}(and probably other places the ORC unwinder gets confused.)
It also manifests itself in other, more visible ways. For example, a kernel module that calls
dump_stack()in its init function or even /proc/<pid>/stack:(fgkaslr on)
------------Call Trace: ? dump_stack+0x57/0x73 ? 0xffffffffc0850000 ? mymodule_init+0xa/0x1000 [dumpstack] ? do_one_initcall+0x46/0x1f0 ? free_unref_page_commit+0x91/0x100 ? _cond_resched+0x15/0x30 ? kmem_cache_alloc_trace+0x14b/0x210 ? do_init_module+0x5a/0x220 ? load_module+0x1912/0x1b20 ? __do_sys_finit_module+0xa8/0x110 ? __do_sys_finit_module+0xa8/0x110 ? do_syscall_64+0x47/0x80 ? entry_SYSCALL_64_after_hwframe+0x44/0xa9% sudo cat
/proc/$$/stack[<0>] do_wait+0x1c3/0x230 [<0>] kernel_wait4+0xa6/0x140fgkaslr=off
-----------Call Trace: dump_stack+0x57/0x73 ? 0xffffffffc04f2000 mymodule_init+0xa/0x1000 [readonly] do_one_initcall+0x46/0x1f0 ? free_unref_page_commit+0x91/0x100 ? _cond_resched+0x15/0x30 ? kmem_cache_alloc_trace+0x14b/0x210 do_init_module+0x5a/0x220 load_module+0x1912/0x1b20 ? __do_sys_finit_module+0xa8/0x110 __do_sys_finit_module+0xa8/0x110 do_syscall_64+0x47/0x80 entry_SYSCALL_64_after_hwframe+0x44/0xa9% sudo cat
/proc/$$/stack[<0>] do_wait+0x1c3/0x230 [<0>] kernel_wait4+0xa6/0x140 [<0>] __do_sys_wait4+0x83/0x90 [<0>] do_syscall_64+0x47/0x80 [<0>] entry_SYSCALL_64_after_hwframe+0x44/0xa9
Quoted 9 lines
I would think fixing and verifying these latter cases would be easier than
chasing livepatch transitions (but would still probably fix klp case, too).
Perhaps Josh or someone has other ORC unwinder tests that could be used?-- Joe
Hi Joe,
Thanks for testing. Yes, Josh and I have been discussing the orc_unwind issues. I've root caused one issue already, in that objtool places an orc_unwind_ip address just outside the section, so my algorithm fails to relocate this address. There are other issues as well that I still haven't root caused. I'll be addressing this in v5 and plan to have something that passes livepatch testing with that version.
Kristen
Quoted 6 lines · Kristen Carlson Accardi
Thanks for testing. Yes, Josh and I have been discussing the
orc_unwindissues. I've root caused one issue already, in that objtool places anorc_unwind_ipaddress just outside the section, so my algorithm fails to relocate this address. There are other issues as well that I still haven't root caused. I'll be addressing this in v5 and plan to have something that passes livepatch testing with that version.
FWIW, I'm okay with seeing fgkaslr be developed progressively. Getting it working with !livepatching would be fine as a first step. There's value in getting the general behavior landed, and then continuing to improve it.
Signature · 1 line
Kees Cook
Quoted 13 lines · Kees Cook
Quoted 10 lines · Kristen Carlson Accardi
Thanks for testing. Yes, Josh and I have been discussing the
orc_unwind
issues. I've root caused one issue already, in that objtool places anorc_unwind_ipaddress just outside the section, so my algorithm fails
to relocate this address. There are other issues as well that I still
haven't root caused. I'll be addressing this in v5 and plan to have something that passes livepatch testing with that version.
Quoted 6 lines
FWIW, I'm okay with seeing fgkaslr be developed progressively. Getting
it working with !livepatching would be fine as a first step. There's value in getting the general behavior landed, and then continuing to improve it.
In this case, part of the issue with livepatching appears to be a more general issue with objtool and how it creates the orc unwind entries when you have >64K sections. So livepatching is a good test case for making sure that the orc tables are actually correct. However, the other issue with livepatching (the duplicate symbols), might be worth deferring if the solution is complex - I will keep that in mind as I look at it more closely.
Quoted 550 lines · Joe Lawrence
Quoted 415 lines · Kristen Carlson Accardi
Function Granular Kernel Address Space Layout Randomization (fgkaslr)
-----------------------------------------------------------------
----This patch set is an implementation of finer grained kernel address space
randomization. It rearranges your kernel code at load time on a per-function level granularity, with only around a second added to
boot time.Changes in v4:
-------------
* dropped the patch to split out change to STATIC definition inx86/boot/compressed/misc.cand replaced with a patch authored by Kees Cook to avoid the duplicate malloc definitions
* Added a section toDocumentation/admin-guide/kernel-parameters.txt
to document the fgkaslr boot option.
* redesigned the patch to hide the new layout when reading/proc/kallsyms. The previous implementation utilized a
dynamically
allocated linked list to display the kernel and module symbols in alphabetical order. The new implementation uses a randomly shuffled index array to display the kernel and module symbols in a random order.Changes in v3:
-------------
*Makefilechanges to accommodateCONFIG_LD_DEAD_CODE_DATA_ELIMINATION
* removal of extraneousALIGN_PAGEfrom_etextchanges
* changed variable names in x86/tools/relocs to be less confusing
* split out change to STATIC definition inx86/boot/compressed/misc.c
* Updates to Documentation to make it more clear what is preserved in .text
* much more detailed commit message for function granular KASLR patch
* minor tweaks and changes that make for more readable code
* this cover letter updated slightly to add additional detailsChanges in v2:
--------------
* Fix to address i386 build failure
* Allow module reordering patch to be configured separately so that arm (or other non-x86_64 arches) can take advantage of module
function
reordering. This support has not be tested by me, but smoke
tested by
Ard Biesheuvel <[email protected]> on arm.
* Fix build issue when building on arm as reported by Ard Biesheuvel <[email protected]>Patches to objtool are included because they are dependencies for this
patchset, however they have been submitted by their maintainer separately.Background
----------
KASLR was merged into the kernel with the objective of increasing the
difficulty of code reuse attacks. Code reuse attacks reused existing code
snippets to get around existing memory protections. They exploit software bugs
which expose addresses of useful code snippets to control the flow of
execution for their own nefarious purposes. KASLR moves the entire kernel
code text as a unit at boot time in order to make addresses less predictable.
The order of the code within the segment is unchanged - only the base address
is shifted. There are a few shortcomings to this algorithm.1. Low Entropy - there are only so many locations the kernel can fit in. This
means an attacker could guess without too much trouble.
2. Knowledge of a single address can reveal the offset of the base address,
exposing all other locations for a published/known kernel image.
3. Info leaks abound.Finer grained ASLR has been proposed as a way to make ASLR more resistant
to info leaks. It is not a new concept at all, and there are many variations
possible. Function reordering is an implementation of finer grained ASLR
which randomizes the layout of an address space on a function level granularity. We use the term "fgkaslr" in this document to refer to the
technique of function reordering when used with KASLR, as well as finer grained
KASLR in general.Proposed Improvement
--------------------
This patch set proposes adding function reordering on top of the existing
KASLR base address randomization. The over-arching objective is incremental
improvement over what we already have. It is designed to work in combination
with the existing solution. The implementation is really pretty simple, and
there are 2 main area where changes occur:* Build time
GCC has had an option to place functions into individual .text sections for
many years now. This option can be used to implement function reordering at
load time. The final compiled vmlinux retains all the section headers, which
can be used to help find the address ranges of each function. Using this
information and an expanded table of relocation addresses, individual text
sections can be suffled immediately after decompression. Some data tables
inside the kernel that have assumptions about order require re- sorting
after being updated when applying relocations. In order to modify these tables,
a few key symbols are excluded from the objcopy symbol stripping process for
use after shuffling the text segments.Some highlights from the build time changes to look for:
The top level kernel
Makefilewas modified to add the gcc flag if it
is supported. Currently, I am applying this flag to everything it is
possible to randomize. Anything that is written in C and not present in a
special input section is randomized. The final binary segment 0 retains a
consolidated .text section, as well as all the individual .text.* sections.
Future work could turn off this flags for selected files or even entire
subsystems, although obviously at the cost of security.The relocs tool is updated to add relative relocations. This information
previously wasn't included because it wasn't necessary when moving the
entire .text segment as a unit.A new file was created to contain a list of symbols that objcopy should
keep. We use those symbols at load time as described below.* Load time
The boot kernel was modified to parse the vmlinux elf file after decompression to check for our interesting symbols that we kept, and to
look for any .text.* sections to randomize. The consolidated .text section
is skipped and not moved. The sections are shuffled randomly, and copied
into memory following the .text section in a new random order. The existing
code which updated relocation addresses was modified to account for not just a fixed delta from the load address, but the offset that the function
section was moved to. This requires inspection of each address to see if
it was impacted by a randomization. We use a bsearch to make this less
horrible on performance. Any tables that need to be modified with new
addresses or resorted are updated using the symbol addresses parsed from the
elf symbol table.In order to hide our new layout, symbols reported through
/proc/kallsyms
will be displayed in a random order.Security Considerations
-----------------------
The objective of this patch set is to improve a technology that is already
merged into the kernel (KASLR). This code will not prevent all attacks,
but should instead be considered as one of several tools that can be used.
In particular, this code is meant to make KASLR more effective in the presence
of info leaks.How much entropy we are adding to the existing entropy of standard KASLR will
depend on a few variables. Firstly and most obviously, the number of functions
that are randomized matters. This implementation keeps the existing .text
section for code that cannot be randomized - for example, because it was
assembly code. The less sections to randomize, the less entropy. In addition,
due to alignment (16 bytes forx86_64), the number of bits in a address that
the attacker needs to guess is reduced, as the lower bits are identical.Performance Impact
------------------
There are two areas where function reordering can impact
performance: boot
time latency, and run time performance.* Boot time latency
This implementation of finer grained KASLR impacts the boot time of the kernel
in several places. It requires additional parsing of the kernel ELF file to
obtain the section headers of the sections to be randomized. It calls the
random number generator for each section to be randomized to determine that
section's new memory location. It copies the decompressed kernel into a new
area of memory to avoid corruption when laying out the newly randomized
sections. It increases the number of relocations the kernel has to perform at
boot time vs. standard KASLR, and it also requires a lookup on each address
that needs to be relocated to see if it was in a randomized section and needs
to be adjusted by a new offset. Finally, it re-sorts a few data tables that
are required to be sorted by address.Booting a test VM on a modern, well appointed system showed an increase in
latency of approximately 1 second.* Run time
The performance impact at run-time of function reordering varies by workload.
Using kcbench, a kernel compilation benchmark, the performance of a kernel
build with finer grained KASLR was about 1% slower than a kernel with standard
KASLR. Analysis with perf showed a slightly higher percentage of L1-icache-load-misses. Other workloads were examined as well, with varied
results. Some workloads performed significantly worse under FGKASLR, while
others stayed the same or were mysteriously better. In general, it will
depend on the code flow whether or not finer grained KASLR will impact
your workload, and how the underlying code was designed. Because the layout
changes per boot, each time a system is rebooted the performance of a workload
may change.Future work could identify hot areas that may not be randomized and either
leave them in the .text section or group them together into a single section
that may be randomized. If grouping things together helps, one other thing to
consider is that if we could identify text blobs that should be grouped together
to benefit a particular code flow, it could be interesting to explore
whether this security feature could be also be used as a performance
feature if you are interested in optimizing your kernel layout for a
particular workload at boot time. Optimizing function layout for a particular
workload has been researched and proven effective - for more information
read the Facebook paper "Optimizing Function Placement for Large- Scale
Data-Center Applications" (see references section below).Image Size
----------
Adding additional section headers as a result of compiling with -ffunction-sections will increase the size of the vmlinux ELF file. With a standard distro config, the resulting vmlinux was increased by
about 3%. The compressed image is also increased due to the header files,
as well as the extra relocations that must be added. You can expect fgkaslr
to increase the size of the compressed image by about 15%.Memory Usage
------------
fgkaslr increases the amount of heap that is required at boot time, although this extra memory is released when the kernel has finished decompression. As a result, it may not be appropriate to use this feature on
systems without much memory.Building
--------
To enable fine grained KASLR, you need to have the following config options
set (including all the ones you would use to build normal KASLR)
CONFIG_FG_KASLR=yIn addition, fgkaslr is only supported for the
X86_64architecture.Modules
-------
Modules are randomized similarly to the rest of the kernel by shuffling
the sections at load time prior to moving them into memory. The module must
also have been build with the -ffunction-sections compiler option.Although fgkaslr for the kernel is only supported for the
X86_64architecture,
it is possible to use fgkaslr with modules on other architectures. To enable
this feature, select
CONFIG_MODULE_FG_KASLR=yThis option is selected automatically for
X86_64whenCONFIG_FG_KASLRis set.Disabling
---------
Disabling normal KASLR using the nokaslr command line option also disables
fgkaslr. It is also possible to disable fgkaslr separately by booting with
fgkaslr=off on the commandline.References
----------
There are a lot of academic papers which explore finer grained ASLR.
This paper in particular contributed the most to my implementation design
as well as my overall understanding of the problem space:Selfrando: Securing the Tor Browser against De-anonymization Exploits,
M. Conti, S. Crane, T. Frassetto, et al.For more information on how function layout impacts performance, see:
Optimizing Function Placement for Large-Scale Data-Center Applications,
G. Ottoni, B. MaherKees Cook (2):
x86/boot: Allow a "silent" kaslr random byte fetch x86/boot/compressed: Avoid duplicatemalloc()implementationsKristen Carlson Accardi (8):
objtool: Do not assume order of parent/child functions
x86:tools/relocs: Support >64K section headers
x86:Makefile: Add build and config option forCONFIG_FG_KASLR
x86: Make sure_etextincludes function sections x86/tools: Add relative relocs for randomized functions
x86: Add support for function granular KASLR
kallsyms: Hide layout
module: Reorder functions.../admin-guide/kernel-parameters.txt | 7 + Documentation/security/fgkaslr.rst | 172 ++++ Documentation/security/index.rst | 1 + Makefile | 6 +- arch/x86/Kconfig | 4 + arch/x86/Makefile | 5 + arch/x86/boot/compressed/Makefile | 9 +- arch/x86/boot/compressed/fgkaslr.c | 811 ++++++++++++++++++ arch/x86/boot/compressed/kaslr.c | 4 - arch/x86/boot/compressed/misc.c | 157 +++- arch/x86/boot/compressed/misc.h | 30 + arch/x86/boot/compressed/utils.c | 11 + arch/x86/boot/compressed/vmlinux.symbols | 17 + arch/x86/include/asm/boot.h | 15 +- arch/x86/kernel/vmlinux.lds.S | 17 +- arch/x86/lib/kaslr.c | 18 +- arch/x86/tools/relocs.c | 143 ++- arch/x86/tools/relocs.h | 4 +- arch/x86/tools/relocs_common.c | 15 +- include/asm-generic/vmlinux.lds.h | 18 +- include/linux/decompress/mm.h | 12 +- include/uapi/linux/elf.h | 1 + init/Kconfig | 26 + kernel/kallsyms.c | 163 +++- kernel/module.c | 81 ++ tools/objtool/elf.c | 8 +- 26 files changed, 1670 insertions(+), 85 deletions(-) create mode 100644 Documentation/security/fgkaslr.rst create mode 100644 arch/x86/boot/compressed/fgkaslr.c create mode 100644 arch/x86/boot/compressed/utils.c create mode 100644 arch/x86/boot/compressed/vmlinux.symbolsQuoted 4 lines
base-commit:
11ba468877bb23f28956a35e896356252d63c983Signature · 1 line
2.20.1Apologies in advance if this has already been discussed elsewhere, but I
did finally get around to testing the patchset against the livepatching
kselftests.The livepatching kselftests fail as all livepatches stall their transitions. It appears that reliable (ORC) stack unwinding is broken
when fgkaslr is enabled.Relevant config options:
CONFIG_ARCH_HAS_FG_KASLR=y
CONFIG_ARCH_STACKWALK=y
CONFIG_FG_KASLR=y
CONFIG_HAVE_LIVEPATCH=y
CONFIG_HAVE_RELIABLE_STACKTRACE=y
CONFIG_LIVEPATCH=y
CONFIG_MODULE_FG_KASLR=y
CONFIG_TEST_LIVEPATCH=m
CONFIG_UNWINDER_ORC=yThe livepatch transitions are stuck along this call path:
klp_check_stackstack_trace_save_tsk_reliable arch_stack_walk_reliable /* Check for stack corruption */ if (unwind_error(&state)) return -EINVAL;where the unwinder error is set by
unwind_next_frame():
arch/x86/kernel/unwind_orc.c
boolunwind_next_frame(struct unwind_state *state)sometimes here:
/* End-of-stack check for kernel threads: */ if (orc->sp_reg == ORC_REG_UNDEFINED) { if (!orc->end) goto err; goto the_end; }or here:
/* Prevent a recursive loop due to bad ORC data:
*/if (
state->stack_info.type==prev_type
&&on_stack(&state->stack_info, (void *)state->sp,
sizeof(long))
&&
state->sp<=prev_sp)
{orc_warn_current("stack going in the wrong direction?
at %pB\n",
(void
*)orig_ip);goto
err;}(and probably other places the ORC unwinder gets confused.)
It also manifests itself in other, more visible ways. For example, a kernel module that calls
dump_stack()in its init function or even /proc/<pid>/stack:(fgkaslr on)
------------Call Trace: ? dump_stack+0x57/0x73 ? 0xffffffffc0850000 ? mymodule_init+0xa/0x1000 [dumpstack] ? do_one_initcall+0x46/0x1f0 ? free_unref_page_commit+0x91/0x100 ? _cond_resched+0x15/0x30 ? kmem_cache_alloc_trace+0x14b/0x210 ? do_init_module+0x5a/0x220 ? load_module+0x1912/0x1b20 ? __do_sys_finit_module+0xa8/0x110 ? __do_sys_finit_module+0xa8/0x110 ? do_syscall_64+0x47/0x80 ? entry_SYSCALL_64_after_hwframe+0x44/0xa9% sudo cat
/proc/$$/stack[<0>] do_wait+0x1c3/0x230 [<0>] kernel_wait4+0xa6/0x140fgkaslr=off
-----------Call Trace: dump_stack+0x57/0x73 ? 0xffffffffc04f2000 mymodule_init+0xa/0x1000 [readonly] do_one_initcall+0x46/0x1f0 ? free_unref_page_commit+0x91/0x100 ? _cond_resched+0x15/0x30 ? kmem_cache_alloc_trace+0x14b/0x210 do_init_module+0x5a/0x220 load_module+0x1912/0x1b20 ? __do_sys_finit_module+0xa8/0x110 __do_sys_finit_module+0xa8/0x110 do_syscall_64+0x47/0x80 entry_SYSCALL_64_after_hwframe+0x44/0xa9% sudo cat
/proc/$$/stack[<0>] do_wait+0x1c3/0x230 [<0>] kernel_wait4+0xa6/0x140 [<0>] __do_sys_wait4+0x83/0x90 [<0>] do_syscall_64+0x47/0x80 [<0>] entry_SYSCALL_64_after_hwframe+0x44/0xa9
Quoted 9 lines
I would think fixing and verifying these latter cases would be easier than
chasing livepatch transitions (but would still probably fix klp case, too).
Perhaps Josh or someone has other ORC unwinder tests that could be used?-- Joe
OK, I have root caused these failures to the fact that the relocs for the orc_unwind_ip table that I use to adjust the values of the orc_unwind_ip table after randomization were incorrect because the table is sorted at build time now, thus making the relocs invalid. I can fix this either by turning off BUILDTIME_TABLE_SORT (and now the relocs are fine), or by ignoring any relocs in the orc_unwind_ip table and adjusting without relocs. I think it makes sense to just unset BUILDTIME_TABLE_SORT if CONFIG_FG_KASLR and continue to rely on relocs to work since it is a useless step anyway.
Quoted 7 lines · Kristen Carlson Accardi
Function Granular Kernel Address Space Layout Randomization (fgkaslr)
---------------------------------------------------------------------This patch set is an implementation of finer grained kernel address space randomization. It rearranges your kernel code at load time
on a per-function level granularity, with only around a second added to boot time.
This is a very nice feature IMO, and it should be far more effective at randomizing the kernel, due to the sheer number of randomization bits that kernel function granular randomization presents.
If this is a good approximation of fg-kaslr randomization depth:
thule:~/tip> grep ' [tT] ' /proc/kallsyms | wc -l 88488
... then that's 80K bits of randomization instead of the mere handful of kaslr bits we have today. Very nice!
Quoted 2 lines
In order to hide our new layout, symbols reported through
/proc/kallsymswill be displayed in a random order.
Neat. :-)
Quoted 15 lines
Performance Impact
------------------* Run time
The performance impact at run-time of function reordering varies by workload. Using kcbench, a kernel compilation benchmark, the performance of a kernel build with finer grained KASLR was about 1% slower than a kernel with standard KASLR. Analysis with perf showed a slightly higher percentage of L1-icache-load-misses. Other workloads were examined as well, with varied results. Some workloads performed significantly worse under FGKASLR, while others stayed the same or were mysteriously better. In general, it will depend on the code flow whether or not finer grained KASLR will impact your workload, and how the underlying code was designed. Because the layout changes per boot, each time a system is rebooted the performance of a workload may change.
I'd guess that the biggest performance impact comes from tearing apart 'groups' of functions that particular workloads are using.
In that sense it might be worthwile to add a '__kaslr_group' function tag to key functions, which would keep certain performance critical functions next to each other.
This shouldn't really be a problem, as even with generous amount of grouping the number of randomization bits is incredibly large.
Quoted 11 lines
Future work could identify hot areas that may not be randomized and either leave them in the .text section or group them together into a single section that may be randomized. If grouping things together helps, one other thing to consider is that if we could identify text blobs that should be grouped together to benefit a particular code flow, it could be interesting to explore whether this security feature could be also be used as a performance feature if you are interested in optimizing your kernel layout for a particular workload at boot time. Optimizing function layout for a particular workload has been researched and proven effective - for more information read the Facebook paper "Optimizing Function Placement for Large-Scale Data-Center Applications" (see references section below).
I'm pretty sure the 'grouping' solution would address any real slowdowns.
I'd also suggest allowing the passing in of a boot-time pseudo-random generator seed number, which would allow the creation of a pseudo-randomized but repeatable layout across reboots.
Quoted 8 lines
Image Size
----------
Adding additional section headers as a result of compiling with -ffunction-sections will increase the size of the vmlinux ELF file. With a standard distro config, the resulting vmlinux was increased by about 3%. The compressed image is also increased due to the header files, as well as the extra relocations that must be added. You can expect fgkaslr to increase the size of the compressed image by about 15%.
What is the increase of the resulting raw kernel image? Additional relocations might increase its size (unless I'm missing something) - it would be nice to measure this effect. I'd expect this to be really low.
vmlinux or compressed kernel size doesn't really matter on x86-64, it's a boot time only expense well within typical system resource limits.
Quoted 5 lines
Disabling
---------
Disabling normal KASLR using the nokaslr command line option also disables fgkaslr. It is also possible to disable fgkaslr separately by booting with fgkaslr=off on the commandline.
I'd suggest to also add a 'nofgkaslr' boot option if it doesn't yet exist, to keep usage symmetric with kaslr.
Likewise, there should probably be a 'kaslr=off' option as well.
The less random our user interfaces are, the better ...
Quoted 17 lines
arch/x86/boot/compressed/Makefile | 9 +- arch/x86/boot/compressed/fgkaslr.c | 811 ++++++++++++++++++ arch/x86/boot/compressed/kaslr.c | 4 - arch/x86/boot/compressed/misc.c | 157 +++- arch/x86/boot/compressed/misc.h | 30 + arch/x86/boot/compressed/utils.c | 11 + arch/x86/boot/compressed/vmlinux.symbols | 17 + arch/x86/include/asm/boot.h | 15 +- arch/x86/kernel/vmlinux.lds.S | 17 +- arch/x86/lib/kaslr.c | 18 +- arch/x86/tools/relocs.c | 143 ++- arch/x86/tools/relocs.h | 4 +- arch/x86/tools/relocs_common.c | 15 +- include/asm-generic/vmlinux.lds.h | 18 +- include/linux/decompress/mm.h | 12 +- include/uapi/linux/elf.h | 1 + init/Kconfig | 26 +
Quoted 8 lines
kernel/kallsyms.c | 163 +++- kernel/module.c | 81 ++ tools/objtool/elf.c | 8 +- 26 files changed, 1670 insertions(+), 85 deletions(-) create mode 100644 Documentation/security/fgkaslr.rst create mode 100644 arch/x86/boot/compressed/fgkaslr.c create mode 100644 arch/x86/boot/compressed/utils.c create mode 100644 arch/x86/boot/compressed/vmlinux.symbols
This looks surprisingly lean overall.
Thanks,
Ingo
Hi Mingo, thanks for taking a look, I am glad you like the idea. Some replies below:
Quoted 60 lines · Ingo Molnar
Quoted 11 lines · Kristen Carlson Accardi
Function Granular Kernel Address Space Layout Randomization (fgkaslr)
-----------------------------------------------------------------
----This patch set is an implementation of finer grained kernel address space
randomization. It rearranges your kernel code at load time on a per-function level granularity, with only around a second added to
boot time.This is a very nice feature IMO, and it should be far more effective at randomizing the kernel, due to the sheer number of randomization bits that kernel function granular randomization presents.
If this is a good approximation of fg-kaslr randomization depth:
thule:~/tip> grep ' [tT] '
/proc/kallsyms| wc -l 88488... then that's 80K bits of randomization instead of the mere handful
of kaslr bits we have today. Very nice!Quoted 2 lines
In order to hide our new layout, symbols reported through
/proc/kallsymswill be displayed in a random order.Neat. :-)
Quoted 15 lines
Performance Impact
------------------
* Run time
The performance impact at run-time of function reordering varies by workload.
Using kcbench, a kernel compilation benchmark, the performance of a kernel
build with finer grained KASLR was about 1% slower than a kernel with standard
KASLR. Analysis with perf showed a slightly higher percentage of L1-icache-load-misses. Other workloads were examined as well, with varied
results. Some workloads performed significantly worse under FGKASLR, while
others stayed the same or were mysteriously better. In general, itQuoted 8 lines
will
depend on the code flow whether or not finer grained KASLR will impact
your workload, and how the underlying code was designed. Because the layout
changes per boot, each time a system is rebooted the performance of a workload
may change.I'd guess that the biggest performance impact comes from tearing apart
'groups' of functions that particular workloads are using.
Quoted 7 lines
In that sense it might be worthwile to add a '
__kaslr_group' function
tag to key functions, which would keep certain performance critical functions next to each other.This shouldn't really be a problem, as even with generous amount of grouping the number of randomization bits is incredibly large.
So my strategy so far was to try to get a very basic non-performance optimized fgkaslr mode merged first, then add performance optimized options as a next step. For example, a user might pass in fgkaslr="group" to the fgkaslr kernel parameter to select a layout which groups some things by whatever criteria we want to mitigate some of the performance impact of full randomization, or they might chose fgkaslr="full", which just randomizes everything (the current implementation). If people think it's worth adding the performance optimizations for the initial merge, I can certainly work on those, but i thought it might be better to keep it super simple at first.
Quoted 23 lines
Quoted 14 lines
Future work could identify hot areas that may not be randomized and either
leave them in the .text section or group them together into a single section
that may be randomized. If grouping things together helps, one other thing to
consider is that if we could identify text blobs that should be grouped together
to benefit a particular code flow, it could be interesting to explore
whether this security feature could be also be used as a performance
feature if you are interested in optimizing your kernel layout forQuoted 8 lines
a
particular workload at boot time. Optimizing function layout for a particular
workload has been researched and proven effective - for more information
read the Facebook paper "Optimizing Function Placement for Large- Scale
Data-Center Applications" (see references section below).
Quoted 7 lines
I'm pretty sure the 'grouping' solution would address any real slowdowns.
I'd also suggest allowing the passing in of a boot-time pseudo- random
generator seed number, which would allow the creation of a pseudo-randomized but repeatable layout across reboots.
We talked during the RFC stage of porting the chacha20 code to this early boot stage to use as a prand generator. Ultimately, this means you now have a secret you have to protect (the seed), and so I've dropped this for now. I could see maybe having this as a debug option? I certainly use a prand myself even now when I'm still debugging functional issues (although the one I use for my own debugging isn't suitable for merging).
Quoted 13 lines
Quoted 12 lines
Image Size
----------
Adding additional section headers as a result of compiling with -ffunction-sections will increase the size of the vmlinux ELF file. With a standard distro config, the resulting vmlinux was increased by
about 3%. The compressed image is also increased due to the header files,
as well as the extra relocations that must be added. You can expect fgkaslr
to increase the size of the compressed image by about 15%.
Quoted 5 lines
What is the increase of the resulting raw kernel image? Additional relocations might increase its size (unless I'm missing something) - it would be nice to measure this effect. I'd expect this to be really
low.
By raw kernel image, do you mean just what eventually gets copied into memory after decompression minus the relocation table? If so, this is almost no difference - the only difference is that there is a little bit of change in the padding between sections vs what the non- randomized kernel is because of alignment differences with the new layout. so you wind up with a few extra bytes give or take.
Quoted 47 lines
vmlinux or compressed kernel size doesn't really matter on x86-64, it's a boot time only expense well within typical system resource limits.
Quoted 7 lines
Disabling
---------
Disabling normal KASLR using the nokaslr command line option also disables
fgkaslr. It is also possible to disable fgkaslr separately by booting with
fgkaslr=off on the commandline.I'd suggest to also add a 'nofgkaslr' boot option if it doesn't yet exist, to keep usage symmetric with kaslr.
Likewise, there should probably be a 'kaslr=off' option as well.
The less random our user interfaces are, the better ...
Quoted 18 lines
arch/x86/boot/compressed/Makefile | 9 +- arch/x86/boot/compressed/fgkaslr.c | 811 ++++++++++++++++++ arch/x86/boot/compressed/kaslr.c | 4 - arch/x86/boot/compressed/misc.c | 157 +++- arch/x86/boot/compressed/misc.h | 30 + arch/x86/boot/compressed/utils.c | 11 + arch/x86/boot/compressed/vmlinux.symbols | 17 + arch/x86/include/asm/boot.h | 15 +- arch/x86/kernel/vmlinux.lds.S | 17 +- arch/x86/lib/kaslr.c | 18 +- arch/x86/tools/relocs.c | 143 ++- arch/x86/tools/relocs.h | 4 +- arch/x86/tools/relocs_common.c | 15 +- include/asm-generic/vmlinux.lds.h | 18 +- include/linux/decompress/mm.h | 12 +- include/uapi/linux/elf.h | 1 + init/Kconfig | 26 +Quoted 8 lines
kernel/kallsyms.c | 163 +++- kernel/module.c | 81 ++ tools/objtool/elf.c | 8 +- 26 files changed, 1670 insertions(+), 85 deletions(-) create mode 100644 Documentation/security/fgkaslr.rst create mode 100644 arch/x86/boot/compressed/fgkaslr.c create mode 100644 arch/x86/boot/compressed/utils.c create mode 100644 arch/x86/boot/compressed/vmlinux.symbols
Quoted 1 line
This looks surprisingly lean overall.
Most of the changes outside of fgkaslr.c, module.c, and kallsyms.c were little tweaks here and there to accommodate using -ffunction-sections and handling >64K elf sections, otherwise yes, I tried to keep it very self contained and non-invasive.
Quoted 18 lines · Ingo Molnar
Quoted 4 lines · Kristen Carlson Accardi
[...]
Performance Impact
------------------Quoted 12 lines
* Run time
The performance impact at run-time of function reordering varies by workload. Using kcbench, a kernel compilation benchmark, the performance of a kernel build with finer grained KASLR was about 1% slower than a kernel with standard KASLR. Analysis with perf showed a slightly higher percentage of L1-icache-load-misses. Other workloads were examined as well, with varied results. Some workloads performed significantly worse under FGKASLR, while others stayed the same or were mysteriously better. In general, it will depend on the code flow whether or not finer grained KASLR will impact your workload, and how the underlying code was designed. Because the layout changes per boot, each time a system is rebooted the performance of a workload may change.
Quoted 6 lines
I'd guess that the biggest performance impact comes from tearing apart 'groups' of functions that particular workloads are using.
In that sense it might be worthwile to add a '
__kaslr_group' function tag to key functions, which would keep certain performance critical functions next to each other.
We kind of already do this manually for things like the scheduler, etc, using macros like ".whatever.text", so we might be able to create a more generalized approach for those. Right now they require a "section" macro usage and a linker script __start* and __end* marker, etc:
#define SCHED_TEXT \
ALIGN_FUNCTION(); \
__sched_text_start = .; \
*(.sched.text) \
__sched_text_end = .;Manually collected each whatever_TEXT define and building out each __whatever_start, etc is annoying. It'd be really cool to have linker script have wildcard replacements for build a syntax like this, based on the presences of matching input sections:
.%.text : {
__%_start = .;
*(.%.text.hot)
*(.%.text)
*(.%.text.*)
*(.%.text.unlikely)
__%_end = .;
}Quoted 3 lines
I'd also suggest allowing the passing in of a boot-time pseudo-random generator seed number, which would allow the creation of a pseudo-randomized but repeatable layout across reboots.
This was present in earlier versions of the series.
Signature · 1 line
Kees Cook