Browse Source

Make open_exec() and sys_uselib() use may_open(), instead of duplicating its parts

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Al Viro 16 years ago
parent
commit
a44ddbb6d8
1 changed files with 2 additions and 9 deletions
  1. 2 9
      fs/exec.c

+ 2 - 9
fs/exec.c

@@ -126,11 +126,7 @@ SYSCALL_DEFINE1(uselib, const char __user *, library)
 	if (nd.path.mnt->mnt_flags & MNT_NOEXEC)
 	if (nd.path.mnt->mnt_flags & MNT_NOEXEC)
 		goto exit;
 		goto exit;
 
 
-	error = inode_permission(nd.path.dentry->d_inode,
-				 MAY_READ | MAY_EXEC | MAY_OPEN);
-	if (error)
-		goto exit;
-	error = ima_path_check(&nd.path, MAY_READ | MAY_EXEC | MAY_OPEN);
+	error = may_open(&nd.path, MAY_READ | MAY_EXEC | MAY_OPEN, 0);
 	if (error)
 	if (error)
 		goto exit;
 		goto exit;
 
 
@@ -677,10 +673,7 @@ struct file *open_exec(const char *name)
 	if (nd.path.mnt->mnt_flags & MNT_NOEXEC)
 	if (nd.path.mnt->mnt_flags & MNT_NOEXEC)
 		goto out_path_put;
 		goto out_path_put;
 
 
-	err = inode_permission(nd.path.dentry->d_inode, MAY_EXEC | MAY_OPEN);
-	if (err)
-		goto out_path_put;
-	err = ima_path_check(&nd.path, MAY_EXEC | MAY_OPEN);
+	err = may_open(&nd.path, MAY_EXEC | MAY_OPEN, 0);
 	if (err)
 	if (err)
 		goto out_path_put;
 		goto out_path_put;