* [PATCH] fs/binfmt_elf: use PT_LOAD p_align values for static PIE
@ 2021-12-09 17:40 H.J. Lu
0 siblings, 0 replies; only message in thread
From: H.J. Lu @ 2021-12-09 17:40 UTC (permalink / raw)
To: linux-kernel
Cc: Chris Kennelly, Andrew Morton, Alexander Viro, Alexey Dobriyan,
Song Liu, David Rientjes, Ian Rogers, Hugh Dickens,
Suren Baghdasaryan, Sandeep Patil, Fangrui Song,
Nick Desaulniers, Kirill A . Shutemov, Mike Kravetz, Shuah Khan
Extend
commit ce81bb256a224259ab686742a6284930cbe4f1fa
Author: Chris Kennelly <ckennelly@google.com>
Date: Thu Oct 15 20:12:32 2020 -0700
fs/binfmt_elf: use PT_LOAD p_align values for suitable start address
which fixed PIE binaries built with -Wl,-z,max-page-size=0x200000, to
cover static PIE binaries. This fixes:
https://bugzilla.kernel.org/show_bug.cgi?id=215275
Tested by verifying static PIE binaries with -Wl,-z,max-page-size=0x200000
loading.
Signed-off-by: H.J. Lu <hjl.tools@gmail.com>
---
fs/binfmt_elf.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/fs/binfmt_elf.c b/fs/binfmt_elf.c
index a813b70f594e..bd78587194dc 100644
--- a/fs/binfmt_elf.c
+++ b/fs/binfmt_elf.c
@@ -1110,11 +1110,11 @@ static int load_elf_binary(struct linux_binprm *bprm)
* independently randomized mmap region (0 load_bias
* without MAP_FIXED).
*/
- if (interpreter) {
+ alignment = maximum_alignment(elf_phdata, elf_ex->e_phnum);
+ if (alignment > ELF_MIN_ALIGN) {
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;
--
2.33.1
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2021-12-09 17:45 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-12-09 17:40 [PATCH] fs/binfmt_elf: use PT_LOAD p_align values for static PIE H.J. Lu
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®