Commit 0b8c78f2 authored by Mike Frysinger's avatar Mike Frysinger Committed by Linus Torvalds
Browse files

flat: use IS_ERR_VALUE() helper macro



There is a common macro now for testing mixed pointer/errno values, so use
that rather than handling the casts ourself.
Signed-off-by: default avatarMike Frysinger <vapier@gentoo.org>
Acked-by: default avatarDavid McCullough <david_mccullough@securecomputing.com>
Acked-by: default avatarGreg Ungerer <gerg@uclinux.org>
Cc: David Howells <dhowells@redhat.com>
Cc: Paul Mundt <lethal@linux-sh.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 8e8b63a6
...@@ -278,8 +278,6 @@ static int decompress_exec( ...@@ -278,8 +278,6 @@ static int decompress_exec(
ret = bprm->file->f_op->read(bprm->file, buf, LBUFSIZE, &fpos); ret = bprm->file->f_op->read(bprm->file, buf, LBUFSIZE, &fpos);
if (ret <= 0) if (ret <= 0)
break; break;
if (ret >= (unsigned long) -4096)
break;
len -= ret; len -= ret;
strm.next_in = buf; strm.next_in = buf;
...@@ -335,7 +333,7 @@ calc_reloc(unsigned long r, struct lib_info *p, int curid, int internalp) ...@@ -335,7 +333,7 @@ calc_reloc(unsigned long r, struct lib_info *p, int curid, int internalp)
"(%d != %d)", (unsigned) r, curid, id); "(%d != %d)", (unsigned) r, curid, id);
goto failed; goto failed;
} else if ( ! p->lib_list[id].loaded && } else if ( ! p->lib_list[id].loaded &&
load_flat_shared_library(id, p) > (unsigned long) -4096) { IS_ERR_VALUE(load_flat_shared_library(id, p))) {
printk("BINFMT_FLAT: failed to load library %d", id); printk("BINFMT_FLAT: failed to load library %d", id);
goto failed; goto failed;
} }
...@@ -545,7 +543,7 @@ static int load_flat_file(struct linux_binprm * bprm, ...@@ -545,7 +543,7 @@ static int load_flat_file(struct linux_binprm * bprm,
textpos = do_mmap(bprm->file, 0, text_len, PROT_READ|PROT_EXEC, textpos = do_mmap(bprm->file, 0, text_len, PROT_READ|PROT_EXEC,
MAP_PRIVATE|MAP_EXECUTABLE, 0); MAP_PRIVATE|MAP_EXECUTABLE, 0);
up_write(&current->mm->mmap_sem); up_write(&current->mm->mmap_sem);
if (!textpos || textpos >= (unsigned long) -4096) { if (!textpos || IS_ERR_VALUE(textpos)) {
if (!textpos) if (!textpos)
textpos = (unsigned long) -ENOMEM; textpos = (unsigned long) -ENOMEM;
printk("Unable to mmap process text, errno %d\n", (int)-textpos); printk("Unable to mmap process text, errno %d\n", (int)-textpos);
...@@ -560,7 +558,7 @@ static int load_flat_file(struct linux_binprm * bprm, ...@@ -560,7 +558,7 @@ static int load_flat_file(struct linux_binprm * bprm,
PROT_READ|PROT_WRITE|PROT_EXEC, MAP_PRIVATE, 0); PROT_READ|PROT_WRITE|PROT_EXEC, MAP_PRIVATE, 0);
up_write(&current->mm->mmap_sem); up_write(&current->mm->mmap_sem);
if (realdatastart == 0 || realdatastart >= (unsigned long)-4096) { if (realdatastart == 0 || IS_ERR_VALUE(realdatastart)) {
if (!realdatastart) if (!realdatastart)
realdatastart = (unsigned long) -ENOMEM; realdatastart = (unsigned long) -ENOMEM;
printk("Unable to allocate RAM for process data, errno %d\n", printk("Unable to allocate RAM for process data, errno %d\n",
...@@ -587,7 +585,7 @@ static int load_flat_file(struct linux_binprm * bprm, ...@@ -587,7 +585,7 @@ static int load_flat_file(struct linux_binprm * bprm,
result = bprm->file->f_op->read(bprm->file, (char *) datapos, result = bprm->file->f_op->read(bprm->file, (char *) datapos,
data_len + (relocs * sizeof(unsigned long)), &fpos); data_len + (relocs * sizeof(unsigned long)), &fpos);
} }
if (result >= (unsigned long)-4096) { if (IS_ERR_VALUE(result)) {
printk("Unable to read data+bss, errno %d\n", (int)-result); printk("Unable to read data+bss, errno %d\n", (int)-result);
do_munmap(current->mm, textpos, text_len); do_munmap(current->mm, textpos, text_len);
do_munmap(current->mm, realdatastart, data_len + extra); do_munmap(current->mm, realdatastart, data_len + extra);
...@@ -607,7 +605,7 @@ static int load_flat_file(struct linux_binprm * bprm, ...@@ -607,7 +605,7 @@ static int load_flat_file(struct linux_binprm * bprm,
PROT_READ | PROT_EXEC | PROT_WRITE, MAP_PRIVATE, 0); PROT_READ | PROT_EXEC | PROT_WRITE, MAP_PRIVATE, 0);
up_write(&current->mm->mmap_sem); up_write(&current->mm->mmap_sem);
if (!textpos || textpos >= (unsigned long) -4096) { if (!textpos || IS_ERR_VALUE(textpos)) {
if (!textpos) if (!textpos)
textpos = (unsigned long) -ENOMEM; textpos = (unsigned long) -ENOMEM;
printk("Unable to allocate RAM for process text/data, errno %d\n", printk("Unable to allocate RAM for process text/data, errno %d\n",
...@@ -641,7 +639,7 @@ static int load_flat_file(struct linux_binprm * bprm, ...@@ -641,7 +639,7 @@ static int load_flat_file(struct linux_binprm * bprm,
fpos = 0; fpos = 0;
result = bprm->file->f_op->read(bprm->file, result = bprm->file->f_op->read(bprm->file,
(char *) textpos, text_len, &fpos); (char *) textpos, text_len, &fpos);
if (result < (unsigned long) -4096) if (!IS_ERR_VALUE(result))
result = decompress_exec(bprm, text_len, (char *) datapos, result = decompress_exec(bprm, text_len, (char *) datapos,
data_len + (relocs * sizeof(unsigned long)), 0); data_len + (relocs * sizeof(unsigned long)), 0);
} }
...@@ -651,13 +649,13 @@ static int load_flat_file(struct linux_binprm * bprm, ...@@ -651,13 +649,13 @@ static int load_flat_file(struct linux_binprm * bprm,
fpos = 0; fpos = 0;
result = bprm->file->f_op->read(bprm->file, result = bprm->file->f_op->read(bprm->file,
(char *) textpos, text_len, &fpos); (char *) textpos, text_len, &fpos);
if (result < (unsigned long) -4096) { if (!IS_ERR_VALUE(result)) {
fpos = ntohl(hdr->data_start); fpos = ntohl(hdr->data_start);
result = bprm->file->f_op->read(bprm->file, (char *) datapos, result = bprm->file->f_op->read(bprm->file, (char *) datapos,
data_len + (relocs * sizeof(unsigned long)), &fpos); data_len + (relocs * sizeof(unsigned long)), &fpos);
} }
} }
if (result >= (unsigned long)-4096) { if (IS_ERR_VALUE(result)) {
printk("Unable to read code+data+bss, errno %d\n",(int)-result); printk("Unable to read code+data+bss, errno %d\n",(int)-result);
do_munmap(current->mm, textpos, text_len + data_len + extra + do_munmap(current->mm, textpos, text_len + data_len + extra +
MAX_SHARED_LIBS * sizeof(unsigned long)); MAX_SHARED_LIBS * sizeof(unsigned long));
...@@ -835,7 +833,7 @@ static int load_flat_shared_library(int id, struct lib_info *libs) ...@@ -835,7 +833,7 @@ static int load_flat_shared_library(int id, struct lib_info *libs)
res = prepare_binprm(&bprm); res = prepare_binprm(&bprm);
if (res <= (unsigned long)-4096) if (!IS_ERR_VALUE(res))
res = load_flat_file(&bprm, libs, id, NULL); res = load_flat_file(&bprm, libs, id, NULL);
abort_creds(bprm.cred); abort_creds(bprm.cred);
...@@ -880,7 +878,7 @@ static int load_flat_binary(struct linux_binprm * bprm, struct pt_regs * regs) ...@@ -880,7 +878,7 @@ static int load_flat_binary(struct linux_binprm * bprm, struct pt_regs * regs)
stack_len += FLAT_DATA_ALIGN - 1; /* reserve for upcoming alignment */ stack_len += FLAT_DATA_ALIGN - 1; /* reserve for upcoming alignment */
res = load_flat_file(bprm, &libinfo, 0, &stack_len); res = load_flat_file(bprm, &libinfo, 0, &stack_len);
if (res > (unsigned long)-4096) if (IS_ERR_VALUE(res))
return res; return res;
/* Update data segment pointers for all libraries */ /* Update data segment pointers for all libraries */
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment