mirror of
https://github.com/torvalds/linux.git
synced 2024-10-23 05:30:55 +00:00
binfmt_elf: replace IS_ERR() with IS_ERR_VALUE()
Avoid typecasts that are needed for IS_ERR() and use IS_ERR_VALUE() instead. Signed-off-by: Bo Liu <liubo03@inspur.com> Signed-off-by: Kees Cook <keescook@chromium.org> Link: https://lore.kernel.org/r/20221115031757.2426-1-liubo03@inspur.com
This commit is contained in:
parent
ef20c5139c
commit
dc64cc12bc
|
@ -1160,7 +1160,7 @@ out_free_interp:
|
||||||
error = elf_map(bprm->file, load_bias + vaddr, elf_ppnt,
|
error = elf_map(bprm->file, load_bias + vaddr, elf_ppnt,
|
||||||
elf_prot, elf_flags, total_size);
|
elf_prot, elf_flags, total_size);
|
||||||
if (BAD_ADDR(error)) {
|
if (BAD_ADDR(error)) {
|
||||||
retval = IS_ERR((void *)error) ?
|
retval = IS_ERR_VALUE(error) ?
|
||||||
PTR_ERR((void*)error) : -EINVAL;
|
PTR_ERR((void*)error) : -EINVAL;
|
||||||
goto out_free_dentry;
|
goto out_free_dentry;
|
||||||
}
|
}
|
||||||
|
@ -1245,7 +1245,7 @@ out_free_interp:
|
||||||
interpreter,
|
interpreter,
|
||||||
load_bias, interp_elf_phdata,
|
load_bias, interp_elf_phdata,
|
||||||
&arch_state);
|
&arch_state);
|
||||||
if (!IS_ERR((void *)elf_entry)) {
|
if (!IS_ERR_VALUE(elf_entry)) {
|
||||||
/*
|
/*
|
||||||
* load_elf_interp() returns relocation
|
* load_elf_interp() returns relocation
|
||||||
* adjustment
|
* adjustment
|
||||||
|
@ -1254,7 +1254,7 @@ out_free_interp:
|
||||||
elf_entry += interp_elf_ex->e_entry;
|
elf_entry += interp_elf_ex->e_entry;
|
||||||
}
|
}
|
||||||
if (BAD_ADDR(elf_entry)) {
|
if (BAD_ADDR(elf_entry)) {
|
||||||
retval = IS_ERR((void *)elf_entry) ?
|
retval = IS_ERR_VALUE(elf_entry) ?
|
||||||
(int)elf_entry : -EINVAL;
|
(int)elf_entry : -EINVAL;
|
||||||
goto out_free_dentry;
|
goto out_free_dentry;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue
Block a user