Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1a159dd2 authored by Miklos Szeredi's avatar Miklos Szeredi Committed by Linus Torvalds
Browse files

exec: remove unnecessary check for MNT_NOEXEC 



vfs_permission(MAY_EXEC) checks if the filesystem is mounted with "noexec", so
there's no need to repeat this check in sys_uselib() and open_exec().

Signed-off-by: default avatarMiklos Szeredi <mszeredi@suse.cz>
Cc: Al Viro <viro@zeniv.linux.org.uk>
Cc: Christoph Hellwig <hch@lst.de>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 22590e41

fs/exec.c

+1 −5
Original line number Diff line number Diff line
@@ -112,9 +112,6 @@ asmlinkage long sys_uselib(const char __user * library) 
	if (error)

		goto out;



	error = -EACCES;

	if (nd.mnt->mnt_flags & MNT_NOEXEC)

		goto exit;

	error = -EINVAL;

	if (!S_ISREG(nd.dentry->d_inode->i_mode))

		goto exit;
@@ -658,8 +655,7 @@ struct file *open_exec(const char *name) 
	if (!err) {

		struct inode *inode = nd.dentry->d_inode;

		file = ERR_PTR(-EACCES);

		if (!(nd.mnt->mnt_flags & MNT_NOEXEC) &&

		    S_ISREG(inode->i_mode)) {

		if (S_ISREG(inode->i_mode)) {

			int err = vfs_permission(&nd, MAY_EXEC);

			file = ERR_PTR(err);

			if (!err) {