Skip to content

Commit d23a61e

Browse files
Tetsuo Handatorvalds
authored andcommitted
fs, elf: don't complain MAP_FIXED_NOREPLACE unless -EEXIST error
Commit 4ed2863 ("fs, elf: drop MAP_FIXED usage from elf_map") is printing spurious messages under memory pressure due to map_addr == -ENOMEM. 9794 (a.out): Uhuuh, elf segment at 00007f2e34738000(fffffffffffffff4) requested but the memory is mapped already 14104 (a.out): Uhuuh, elf segment at 00007f34fd76c000(fffffffffffffff4) requested but the memory is mapped already 16843 (a.out): Uhuuh, elf segment at 00007f930ecc7000(fffffffffffffff4) requested but the memory is mapped already Complain only if -EEXIST, and use %px for printing the address. Link: http://lkml.kernel.org/r/[email protected] Fixes: 4ed2863 ("fs, elf: drop MAP_FIXED usage from elf_map") is Signed-off-by: Tetsuo Handa <[email protected]> Acked-by: Michal Hocko <[email protected]> Cc: Andrei Vagin <[email protected]> Cc: Khalid Aziz <[email protected]> Cc: Michael Ellerman <[email protected]> Cc: Kees Cook <[email protected]> Cc: Abdul Haleem <[email protected]> Cc: Joel Stanley <[email protected]> Cc: Anshuman Khandual <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
1 parent a841aa8 commit d23a61e

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

fs/binfmt_elf.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -377,10 +377,10 @@ static unsigned long elf_map(struct file *filep, unsigned long addr,
377377
} else
378378
map_addr = vm_mmap(filep, addr, size, prot, type, off);
379379

380-
if ((type & MAP_FIXED_NOREPLACE) && BAD_ADDR(map_addr))
381-
pr_info("%d (%s): Uhuuh, elf segment at %p requested but the memory is mapped already\n",
382-
task_pid_nr(current), current->comm,
383-
(void *)addr);
380+
if ((type & MAP_FIXED_NOREPLACE) &&
381+
PTR_ERR((void *)map_addr) == -EEXIST)
382+
pr_info("%d (%s): Uhuuh, elf segment at %px requested but the memory is mapped already\n",
383+
task_pid_nr(current), current->comm, (void *)addr);
384384

385385
return(map_addr);
386386
}

0 commit comments

Comments
 (0)