[<prev] [next>] [day] [month] [year] [list]
Date: Thu, 10 Nov 2022 21:57:54 -0800
From: Kees Cook <keescook@...omium.org>
To: Pedro Falcato <pedro.falcato@...il.com>
Cc: Kees Cook <keescook@...omium.org>, Rich Felker <dalias@...c.org>,
Fangrui Song <maskray@...gle.com>,
Alexander Viro <viro@...iv.linux.org.uk>,
Eric Biederman <ebiederm@...ssion.com>,
linux-fsdevel@...r.kernel.org, linux-mm@...ck.org,
linux-kernel@...r.kernel.org, linux-hardening@...r.kernel.org
Subject: [PATCH] binfmt_elf: Allow .bss in any interp PT_LOAD
Traditionally, only the final PT_LOAD for load_elf_interp() supported
having p_memsz > p_filesz. Recently, lld's construction of musl's
libc.so on PowerPC64 started having two PT_LOAD program headers with
p_memsz > p_filesz.
As the least invasive change possible, check for p_memsz > p_filesz for
each PT_LOAD in load_elf_interp.
Reported-by: Rich Felker <dalias@...c.org>
Link: https://maskray.me/blog/2022-11-05-lld-musl-powerpc64
Cc: Pedro Falcato <pedro.falcato@...il.com>
Cc: Fangrui Song <maskray@...gle.com>
Cc: Alexander Viro <viro@...iv.linux.org.uk>
Cc: Eric Biederman <ebiederm@...ssion.com>
Cc: linux-fsdevel@...r.kernel.org
Cc: linux-mm@...ck.org
Signed-off-by: Kees Cook <keescook@...omium.org>
---
Rich, Pedro, and Fangrui, are you able to test this change? I haven't
constructed a trivial reproducer yet (though it would be nice to have
a self-contained test-case).
---
fs/binfmt_elf.c | 19 ++++++++++---------
1 file changed, 10 insertions(+), 9 deletions(-)
diff --git a/fs/binfmt_elf.c b/fs/binfmt_elf.c
index 528e2ac8931f..3f07945ff085 100644
--- a/fs/binfmt_elf.c
+++ b/fs/binfmt_elf.c
@@ -673,18 +673,19 @@ static unsigned long load_elf_interp(struct elfhdr *interp_elf_ex,
last_bss = k;
bss_prot = elf_prot;
}
+
+ /*
+ * Now fill out any zeroed region (e.g. .bss): first pad the
+ * last page from the file up to the page boundary, and zero
+ * it from elf_bss up to the end of the page.
+ */
+ if (last_bss > elf_bss && padzero(elf_bss)) {
+ error = -EFAULT;
+ goto out;
+ }
}
}
- /*
- * Now fill out the bss section: first pad the last page from
- * the file up to the page boundary, and zero it from elf_bss
- * up to the end of the page.
- */
- if (padzero(elf_bss)) {
- error = -EFAULT;
- goto out;
- }
/*
* Next, align both the file and mem bss up to the page size,
* since this is where elf_bss was just zeroed up to, and where
--
2.34.1
Powered by blists - more mailing lists