Selecting Load Addresses According to p_align
Subsystems (3)
v4 cover Selecting Load Addresses According to p_align
The current ELF loading mechancism provides page-aligned mappings. This can lead to the program being loaded in a way unsuitable for file-backed, transparent huge pages when handling PIE executables.
While specifying -z,max-page-size=0x200000 to the linker will generate suitably aligned segments for huge pages on x86_64, the executable needs to be loaded at a suitably aligned address as well. This alignment requires the binary's cooperation, as distinct segments need to be appropriately paddded to be eligible for THP.
For binaries built with increased alignment, this limits the number of bits usable for ASLR, but provides some randomization over using fixed load addresses/non-PIE binaries.
Changes V3 -> V4:
* Code tweaks based on on-thread feedback
* Addressed compiler warning
Changes V2 -> V3:
* Minor code tweaks based on off-thread feedback
Changes V1 -> V2:
* Added test
Chris Kennelly (2):
fs/binfmt_elf: Use PT_LOAD p_align values for suitable start address. Add self-test for verifying load alignment.
fs/binfmt_elf.c | 25 ++++++++ tools/testing/selftests/exec/.gitignore | 1 + tools/testing/selftests/exec/Makefile | 9 ++- tools/testing/selftests/exec/load_address.c | 68 +++++++++++++++++++++ 4 files changed, 101 insertions(+), 2 deletions(-) create mode 100644 tools/testing/selftests/exec/load_address.c
Signature · 1 line
2.28.0.297.g1956fa8f8d-goog
PATCH v4 1/2 fs/binfmt_elf: Use PT_LOAD p_align values for suitable start address.
The current ELF loading mechancism provides page-aligned mappings. This can lead to the program being loaded in a way unsuitable for file-backed, transparent huge pages when handling PIE executables.
For binaries built with increased alignment, this limits the number of bits usable for ASLR, but provides some randomization over using fixed load addresses/non-PIE binaries.
Tested: verified program with -Wl,-z,max-page-size=0x200000 loading
--- fs/binfmt_elf.c | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+)
fs/binfmt_elf.c +25 -0
@@ -13,6 +13,7 @@#include <linux/module.h> #include <linux/kernel.h> #include <linux/fs.h> +#include <linux/log2.h> #include <linux/mm.h> #include <linux/mman.h> #include <linux/errno.h>
@@ -421,6 +422,26 @@ static int elf_read(struct file *file, void *buf, size_t len, loff_t pos)return 0 ; } +static unsigned long maximum_alignment (struct elf_phdr *cmds,int nr) +{ +unsigned long alignment =0 ; +int i; + +for (i =0 ; i < nr; i++) { +if (cmds[i].p_type ==PT_LOAD ) { +unsigned long p_align = cmds[i].p_align; + +/* skip non-power of two alignments as invalid */ +if (!is_power_of_2 (p_align)) +continue ; + alignment =max (alignment, p_align); + } + } + +/* ensure we align to at least one page */ +return ELF_PAGEALIGN (alignment); +} +/** * load_elf_phdrs() - load ELF program headers * @elf_ex: ELF header of the binary whose program headers should be loaded
@@ -1008,6 +1029,7 @@ static int load_elf_binary(struct linux_binprm *bprm)int elf_prot, elf_flags;unsigned long k, vaddr;unsigned long total_size =0 ; +unsigned long alignment;if (elf_ppnt->p_type !=PT_LOAD )continue ;
@@ -1086,6 +1108,9 @@ static int load_elf_binary(struct linux_binprm *bprm) load_bias =ELF_ET_DYN_BASE ;if (current->flags &PF_RANDOMIZE ) load_bias +=arch_mmap_rnd (); + alignment =maximum_alignment (elf_phdata, elf_ex->e_phnum); +if (alignment) + load_bias &= ~(alignment -1 ); elf_flags |=MAP_FIXED ; }else load_bias =0 ;
Signature · 1 line
2.28.0.297.g1956fa8f8d-goog
PATCH v4 2/2 Add self-test for verifying load alignment.
In reply to Chris KennellyThis produces a PIE binary with a variety of p_align requirements, suitable for verifying that the load address meets that alignment requirement.
--- tools/testing/selftests/exec/.gitignore | 1 + tools/testing/selftests/exec/Makefile | 9 ++- tools/testing/selftests/exec/load_address.c | 68 +++++++++++++++++++++ 3 files changed, 76 insertions(+), 2 deletions(-) create mode 100644 tools/testing/selftests/exec/load_address.c
tools/testing/selftests/exec/.gitignore +1 -0
@@ -7,6 +7,7 @@ execveat.moved execveat.path.ephemeral execveat.ephemeral execveat.denatured +/load_address_* /recursion-depth xxxxxxxx* pipe
tools/testing/selftests/exec/Makefile +7 -2
@@ -4,7 +4,7 @@ CFLAGS += -Wno-nonnull CFLAGS += -D_GNU_SOURCE TEST_PROGS := binfmt_script non-regular -TEST_GEN_PROGS := execveat +TEST_GEN_PROGS := execveat load_address_4096 load_address_2097152 load_address_16777216 TEST_GEN_FILES := execveat.symlink execveat.denatured script subdir pipe # Makefile is a run-time dependency, since it's accessed by the execveat test TEST_FILES := Makefile
@@ -27,4 +27,9 @@ $(OUTPUT)/execveat.symlink: $(OUTPUT)/execveat $(OUTPUT)/execveat.denatured: $(OUTPUT)/execveat cp $< $@ chmod -x $@ - +$(OUTPUT)/load_address_4096: load_address.c + $(CC) $(CFLAGS) $(LDFLAGS) -Wl,-z,max-page-size=0x1000 -pie $< -o $@ +$(OUTPUT)/load_address_2097152: load_address.c + $(CC) $(CFLAGS) $(LDFLAGS) -Wl,-z,max-page-size=0x200000 -pie $< -o $@ +$(OUTPUT)/load_address_16777216: load_address.c + $(CC) $(CFLAGS) $(LDFLAGS) -Wl,-z,max-page-size=0x1000000 -pie $< -o $@
tools/testing/selftests/exec/load_address.c new file +68 -0
68 lines not on this page · raw message
Signature · 1 line
2.28.0.297.g1956fa8f8d-goog