Commit dc64cc12 authored by Bo Liu's avatar Bo Liu Committed by Kees Cook
Browse files

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: default avatarBo Liu <liubo03@inspur.com>
Signed-off-by: default avatarKees Cook <keescook@chromium.org>
Link: https://lore.kernel.org/r/20221115031757.2426-1-liubo03@inspur.com
parent ef20c513

fs/binfmt_elf.c

+3 −3
Original line number Diff line number Diff line
@@ -1160,7 +1160,7 @@ static int load_elf_binary(struct linux_binprm *bprm) 
		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 @@ static int load_elf_binary(struct linux_binprm *bprm) 
					    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 @@ static int load_elf_binary(struct linux_binprm *bprm) 
			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;

		}