adulau/aha
1
0
Fork 0
mirror of https://github.com/adulau/aha.git synced 2024-12-28 11:46:19 +00:00
Code Issues Projects Releases Packages Wiki Activity

bin_elf_fdpic: check the return value of clear_user

Browse source 
Signed-off-by: Mike Frysinger <vapier.adi@gmail.com>
Signed-off-by: Bryan Wu <cooloney@kernel.org>
Cc: David Howells <dhowells@redhat.com>
Cc: Greg Ungerer <gerg@snapgear.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Mike Frysinger 2009-04-02 16:58:28 -07:00 committed by Linus Torvalds
parent 11dea19009
commit ab4ad55512
1 changed files with 17 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
fs/binfmt_elf_fdpic.c
View file

@ -972,9 +972,12 @@ static int elf_fdpic_map_file_constdisp_on_uclinux(
params->elfhdr_addr = seg->addr; params->elfhdr_addr = seg->addr;
/* clear any space allocated but not loaded */ /* clear any space allocated but not loaded */
if (phdr->p_filesz < phdr->p_memsz) if (phdr->p_filesz < phdr->p_memsz) {
clear_user((void *) (seg->addr + phdr->p_filesz), ret = clear_user((void *) (seg->addr + phdr->p_filesz),
phdr->p_memsz - phdr->p_filesz); phdr->p_memsz - phdr->p_filesz);
if (ret)
return ret;
}
if (mm) { if (mm) {
if (phdr->p_flags & PF_X) { if (phdr->p_flags & PF_X) {
@ -1014,7 +1017,7 @@ static int elf_fdpic_map_file_by_direct_mmap(struct elf_fdpic_params *params,
struct elf32_fdpic_loadseg *seg; struct elf32_fdpic_loadseg *seg;
struct elf32_phdr *phdr; struct elf32_phdr *phdr;
unsigned long load_addr, delta_vaddr; unsigned long load_addr, delta_vaddr;
int loop, dvset; int loop, dvset, ret;
load_addr = params->load_addr; load_addr = params->load_addr;
delta_vaddr = 0; delta_vaddr = 0;
@ -1114,7 +1117,9 @@ static int elf_fdpic_map_file_by_direct_mmap(struct elf_fdpic_params *params,
* PT_LOAD */ * PT_LOAD */
if (prot & PROT_WRITE && disp > 0) { if (prot & PROT_WRITE && disp > 0) {
kdebug("clear[%d] ad=%lx sz=%lx", loop, maddr, disp); kdebug("clear[%d] ad=%lx sz=%lx", loop, maddr, disp);
clear_user((void __user *) maddr, disp); ret = clear_user((void __user *) maddr, disp);
if (ret)
return ret;
maddr += disp; maddr += disp;
} }
@ -1149,15 +1154,19 @@ static int elf_fdpic_map_file_by_direct_mmap(struct elf_fdpic_params *params,
if (prot & PROT_WRITE && excess1 > 0) { if (prot & PROT_WRITE && excess1 > 0) {
kdebug("clear[%d] ad=%lx sz=%lx", kdebug("clear[%d] ad=%lx sz=%lx",
loop, maddr + phdr->p_filesz, excess1); loop, maddr + phdr->p_filesz, excess1);
clear_user((void __user *) maddr + phdr->p_filesz, ret = clear_user((void __user *) maddr + phdr->p_filesz,
excess1); excess1);
if (ret)
return ret;
} }
#else #else
if (excess > 0) { if (excess > 0) {
kdebug("clear[%d] ad=%lx sz=%lx", kdebug("clear[%d] ad=%lx sz=%lx",
loop, maddr + phdr->p_filesz, excess); loop, maddr + phdr->p_filesz, excess);
clear_user((void *) maddr + phdr->p_filesz, excess); ret = clear_user((void *) maddr + phdr->p_filesz, excess);
if (ret)
return ret;
} }
#endif #endif