lkml.org 
[lkml]   [2019]   [Mar]   [14]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[PATCH 1/2] elf: simpler check for -EEXIST
    	PTR_ERR((void *)map_addr) == -EEXIST

    is a very complicated way of doing the obvious.

    Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
    ---

    fs/binfmt_elf.c | 3 +--
    1 file changed, 1 insertion(+), 2 deletions(-)

    --- a/fs/binfmt_elf.c
    +++ b/fs/binfmt_elf.c
    @@ -375,8 +375,7 @@ 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) &&
    - PTR_ERR((void *)map_addr) == -EEXIST)
    + if ((type & MAP_FIXED_NOREPLACE) && map_addr == -EEXIST)
    pr_info("%d (%s): Uhuuh, elf segment at %px requested but the memory is mapped already\n",
    task_pid_nr(current), current->comm, (void *)addr);

    \
     
     \ /
      Last update: 2019-03-14 21:43    [W:2.449 / U:0.092 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site