mirror of
https://mirrors.bfsu.edu.cn/git/linux.git
synced 2024-11-11 04:18:39 +08:00
binfmt_flat: Fix corruption when not offsetting data start
[ Upstream commit3eb3cd5992
] Commit04d82a6d08
("binfmt_flat: allow not offsetting data start") introduced a RISC-V specific variant of the FLAT format which does not allocate any space for the (obsolete) array of shared library pointers. However, it did not disable the code which initializes the array, resulting in the corruption of sizeof(long) bytes before the DATA segment, generally the end of the TEXT segment. Introduce MAX_SHARED_LIBS_UPDATE which depends on the state of CONFIG_BINFMT_FLAT_NO_DATA_START_OFFSET to guard the initialization of the shared library pointer region so that it will only be initialized if space is reserved for it. Fixes:04d82a6d08
("binfmt_flat: allow not offsetting data start") Co-developed-by: Stefan O'Rear <sorear@fastmail.com> Signed-off-by: Stefan O'Rear <sorear@fastmail.com> Reviewed-by: Damien Le Moal <dlemoal@kernel.org> Acked-by: Greg Ungerer <gerg@linux-m68k.org> Link: https://lore.kernel.org/r/20240807195119.it.782-kees@kernel.org Signed-off-by: Kees Cook <kees@kernel.org> Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
parent
d38574ff50
commit
9350ba06ee
@ -72,8 +72,10 @@
|
||||
|
||||
#ifdef CONFIG_BINFMT_FLAT_NO_DATA_START_OFFSET
|
||||
#define DATA_START_OFFSET_WORDS (0)
|
||||
#define MAX_SHARED_LIBS_UPDATE (0)
|
||||
#else
|
||||
#define DATA_START_OFFSET_WORDS (MAX_SHARED_LIBS)
|
||||
#define MAX_SHARED_LIBS_UPDATE (MAX_SHARED_LIBS)
|
||||
#endif
|
||||
|
||||
struct lib_info {
|
||||
@ -880,7 +882,7 @@ static int load_flat_binary(struct linux_binprm *bprm)
|
||||
return res;
|
||||
|
||||
/* Update data segment pointers for all libraries */
|
||||
for (i = 0; i < MAX_SHARED_LIBS; i++) {
|
||||
for (i = 0; i < MAX_SHARED_LIBS_UPDATE; i++) {
|
||||
if (!libinfo.lib_list[i].loaded)
|
||||
continue;
|
||||
for (j = 0; j < MAX_SHARED_LIBS; j++) {
|
||||
|
Loading…
Reference in New Issue
Block a user