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

diff --git a/fs/binfmt_elf.c b/fs/binfmt_elf.c
index 528e2ac..d9af34f 100644 (file)
--- a/fs/binfmt_elf.c
+++ b/fs/binfmt_elf.c
@@ -1160,7 +1160,7 @@ out_free_interp:
                error = elf_map(bprm->file, load_bias + vaddr, elf_ppnt,
                                elf_prot, elf_flags, total_size);
                if (BAD_ADDR(error)) {
-                       retval = IS_ERR((void *)error) ?
+                       retval = IS_ERR_VALUE(error) ?
                                PTR_ERR((void*)error) : -EINVAL;
                        goto out_free_dentry;
                }
@@ -1245,7 +1245,7 @@ out_free_interp:
                                            interpreter,
                                            load_bias, interp_elf_phdata,
                                            &arch_state);
-               if (!IS_ERR((void *)elf_entry)) {
+               if (!IS_ERR_VALUE(elf_entry)) {
                        /*
                         * load_elf_interp() returns relocation
                         * adjustment
@@ -1254,7 +1254,7 @@ out_free_interp:
                        elf_entry += interp_elf_ex->e_entry;
                }
                if (BAD_ADDR(elf_entry)) {
-                       retval = IS_ERR((void *)elf_entry) ?
+                       retval = IS_ERR_VALUE(elf_entry) ?
                                        (int)elf_entry : -EINVAL;
                        goto out_free_dentry;
                }