1 files changed, 9 insertions, 4 deletions

diff --git a/fs/binfmt_elf.c b/fs/binfmt_elf.c
index 3edca6cb9a33..46f0438088d3 100644
--- a/fs/binfmt_elf.c
+++ b/fs/binfmt_elf.c
@@ -377,6 +377,11 @@ static unsigned long elf_map(struct file *filep, unsigned long addr,
         } else
                 map_addr = vm_mmap(filep, addr, size, prot, type, off);
 
+        if ((type & MAP_FIXED_NOREPLACE) && BAD_ADDR(map_addr))
+                pr_info("%d (%s): Uhuuh, elf segment at %p requested but the memory is mapped already\n",
+                                task_pid_nr(current), current->comm,
+                                (void *)addr);
+
         return(map_addr);
 }
 
@@ -575,7 +580,7 @@ static unsigned long load_elf_interp(struct elfhdr *interp_elf_ex,
                                 elf_prot |= PROT_EXEC;
                         vaddr = eppnt->p_vaddr;
                         if (interp_elf_ex->e_type == ET_EXEC || load_addr_set)
-                                elf_type |= MAP_FIXED;
+                                elf_type |= MAP_FIXED_NOREPLACE;
                         else if (no_base && interp_elf_ex->e_type == ET_DYN)
                                 load_addr = -vaddr;
 
@@ -939,7 +944,7 @@ static int load_elf_binary(struct linux_binprm *bprm)
                  * the ET_DYN load_addr calculations, proceed normally.
                  */
                 if (loc->elf_ex.e_type == ET_EXEC || load_addr_set) {
-                        elf_flags |= MAP_FIXED;
+                        elf_flags |= MAP_FIXED_NOREPLACE;
                 } else if (loc->elf_ex.e_type == ET_DYN) {
                         /*
                          * This logic is run once for the first LOAD Program
@@ -975,7 +980,7 @@ 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();
-                                elf_flags |= MAP_FIXED;
+                                elf_flags |= MAP_FIXED_NOREPLACE;
                         } else
                                 load_bias = 0;
 
@@ -1235,7 +1240,7 @@ static int load_elf_library(struct file *file)
                         (eppnt->p_filesz +
                          ELF_PAGEOFFSET(eppnt->p_vaddr)),
                         PROT_READ | PROT_WRITE | PROT_EXEC,
-                        MAP_FIXED | MAP_PRIVATE | MAP_DENYWRITE,
+                        MAP_FIXED_NOREPLACE | MAP_PRIVATE | MAP_DENYWRITE,
                         (eppnt->p_offset -
                          ELF_PAGEOFFSET(eppnt->p_vaddr)));
         if (error != ELF_PAGESTART(eppnt->p_vaddr))