projects
/
deliverable
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'patchwork' into topic/docs-next
[deliverable/linux.git]
/
fs
/
binfmt_flat.c
diff --git
a/fs/binfmt_flat.c
b/fs/binfmt_flat.c
index f723cd3a455cbde47e5be8cabb798e0725eefb8e..caf9e39bb82b7fbd0b2387b6dea5332cdc5699de 100644
(file)
--- a/
fs/binfmt_flat.c
+++ b/
fs/binfmt_flat.c
@@
-337,7
+337,7
@@
calc_reloc(unsigned long r, struct lib_info *p, int curid, int internalp)
"(%d != %d)", (unsigned) r, curid, id);
goto failed;
} else if ( ! p->lib_list[id].loaded &&
"(%d != %d)", (unsigned) r, curid, id);
goto failed;
} else if ( ! p->lib_list[id].loaded &&
-
IS_ERR_VALUE(load_flat_shared_library(id, p))
) {
+
load_flat_shared_library(id, p) < 0
) {
printk("BINFMT_FLAT: failed to load library %d", id);
goto failed;
}
printk("BINFMT_FLAT: failed to load library %d", id);
goto failed;
}
@@
-837,7
+837,7
@@
static int load_flat_shared_library(int id, struct lib_info *libs)
res = prepare_binprm(&bprm);
res = prepare_binprm(&bprm);
- if (!
IS_ERR_VALUE(res)
)
+ if (!
res
)
res = load_flat_file(&bprm, libs, id, NULL);
abort_creds(bprm.cred);
res = load_flat_file(&bprm, libs, id, NULL);
abort_creds(bprm.cred);
@@
-883,7
+883,7
@@
static int load_flat_binary(struct linux_binprm * bprm)
stack_len += FLAT_STACK_ALIGN - 1; /* reserve for upcoming alignment */
res = load_flat_file(bprm, &libinfo, 0, &stack_len);
stack_len += FLAT_STACK_ALIGN - 1; /* reserve for upcoming alignment */
res = load_flat_file(bprm, &libinfo, 0, &stack_len);
- if (
IS_ERR_VALUE(res)
)
+ if (
res < 0
)
return res;
/* Update data segment pointers for all libraries */
return res;
/* Update data segment pointers for all libraries */
This page took
0.024972 seconds
and
5
git commands to generate.