Unverified Commit 3a029a36 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!3209 exec: Remove redundant check in do_open_execat/uselib 

Merge Pull Request from: @ci-robot 
 
PR sync from: Zhihao Cheng <chengzhihao1@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/KJYVXM32CUBXAOXERRGVUDXPSXTVJYMB/ 
 
https://gitee.com/openeuler/kernel/issues/I8LX53 
 
Link:https://gitee.com/openeuler/kernel/pulls/3209

 

Reviewed-by: default avatarzhangyi (F) <yi.zhang@huawei.com>
Signed-off-by: default avatarZheng Zengkai <zhengzengkai@huawei.com>
parents e538547f e1c1b4ed

fs/exec.c

+1 −21
Original line number Diff line number Diff line
@@ -142,16 +142,6 @@ SYSCALL_DEFINE1(uselib, const char __user *, library) 
	if (IS_ERR(file))

		goto out;



	/*

	 * may_open() has already checked for this, so it should be

	 * impossible to trip now. But we need to be extra cautious

	 * and check again at the very end too.

	 */

	error = -EACCES;

	if (WARN_ON_ONCE(!S_ISREG(file_inode(file)->i_mode) ||

			 path_noexec(&file->f_path)))

		goto exit;



	error = -ENOEXEC;



	read_lock(&binfmt_lock);
@@ -168,7 +158,7 @@ SYSCALL_DEFINE1(uselib, const char __user *, library) 
			break;

	}

	read_unlock(&binfmt_lock);

exit:



	fput(file);

out:

	return error;
@@ -925,16 +915,6 @@ static struct file *do_open_execat(int fd, struct filename *name, int flags) 
	if (IS_ERR(file))

		goto out;



	/*

	 * may_open() has already checked for this, so it should be

	 * impossible to trip now. But we need to be extra cautious

	 * and check again at the very end too.

	 */

	err = -EACCES;

	if (WARN_ON_ONCE(!S_ISREG(file_inode(file)->i_mode) ||

			 path_noexec(&file->f_path)))

		goto exit;



	err = deny_write_access(file);

	if (err)

		goto exit;