elf: simpler check for -EEXIST
Subsystems (2)
PATCH 1/2 elf: simpler check for -EEXIST
PTR_ERR((void *)map_addr) == -EEXIST
is a very complicated way of doing the obvious.
---
fs/binfmt_elf.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
fs/binfmt_elf.c +1 -2
@@ -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);
Quoted 3 lines · Alexey Dobriyan
PTR_ERR((void *)map_addr) == -EEXISTis a very complicated way of doing the obvious.
Michal suggested me to explicitly use PTR_ERR() for documentation purpose in a reply mail to https://lkml.kernel.org/r/[email protected] .
Quoted 20 lines
Signed-off-by Alexey Dobriyan <[email protected]>---
fs/binfmt_elf.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)fs/binfmt_elf.c +1
-2@@ -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);
Quoted 6 lines · Tetsuo Handa
Quoted 3 lines · Alexey Dobriyan
PTR_ERR((void *)map_addr) == -EEXISTis a very complicated way of doing the obvious.
Michal suggested me to explicitly use
PTR_ERR()
without any explanation why...
I wonder what documentation does this line need?
map_addr == -EEXIST
Quoted 24 lines
for documentation purpose in
a reply mail to https://lkml.kernel.org/r/[email protected] .Quoted 20 lines
Signed-off-by Alexey Dobriyan <[email protected]>---
fs/binfmt_elf.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)fs/binfmt_elf.c +1
-2@@ -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);
Quoted 9 lines · Alexey Dobriyan
Quoted 6 lines · Tetsuo Handa
Quoted 3 lines · Alexey Dobriyan
PTR_ERR((void *)map_addr) == -EEXISTis a very complicated way of doing the obvious.
Michal suggested me to explicitly use
PTR_ERR()without any explanation why...
The return value is ERR_PTR. This code uses unsigned long which is OK but I thought it is better to call out the return value convention explicitly. It is not like I would argue about that though.
Signature · 2 lines
Michal Hocko SUSE Labs