adulau/aha
1
0
Fork 0
mirror of https://github.com/adulau/aha.git synced 2024-12-28 11:46:19 +00:00
Code Issues Projects Releases Packages Wiki Activity

Re: [PATCH 3/6] vfs: open_exec cleanup

Browse source 
On Mon, May 19, 2008 at 12:01:49AM +0200, Marcin Slusarz wrote:
> open_exec is needlessly indented, calls ERR_PTR with 0 argument
> (which is not valid errno) and jumps into middle of function
> just to return value.
> So clean it up a bit.

Still looks rather messy.  See below for a better version.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
This commit is contained in:
Christoph Hellwig 2008-05-19 07:53:34 +02:00 committed by Al Viro
parent beb29e058c
commit e56b6a5dda
1 changed files with 29 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

56
fs/exec.c
View file

@ -656,38 +656,40 @@ EXPORT_SYMBOL(setup_arg_pages);
struct file *open_exec(const char *name) struct file *open_exec(const char *name)
{ {
struct nameidata nd; struct nameidata nd;
int err;
struct file *file; struct file *file;
int err;
err = path_lookup_open(AT_FDCWD, name, LOOKUP_FOLLOW, &nd, FMODE_READ|FMODE_EXEC); err = path_lookup_open(AT_FDCWD, name, LOOKUP_FOLLOW, &nd,
file = ERR_PTR(err); FMODE_READ|FMODE_EXEC);
if (err)
goto out;
if (!err) { err = -EACCES;
struct inode *inode = nd.path.dentry->d_inode; if (!S_ISREG(nd.path.dentry->d_inode->i_mode))
file = ERR_PTR(-EACCES); goto out_path_put;
if (S_ISREG(inode->i_mode)) {
int err = vfs_permission(&nd, MAY_EXEC | MAY_OPEN); err = vfs_permission(&nd, MAY_EXEC | MAY_OPEN);
file = ERR_PTR(err); if (err)
if (!err) { goto out_path_put;
file = nameidata_to_filp(&nd,
O_RDONLY|O_LARGEFILE); file = nameidata_to_filp(&nd, O_RDONLY|O_LARGEFILE);
if (!IS_ERR(file)) { if (IS_ERR(file))
err = deny_write_access(file); return file;
if (err) {
fput(file); err = deny_write_access(file);
file = ERR_PTR(err); if (err) {
} fput(file);
} goto out;
out:
return file;
}
}
release_open_intent(&nd);
path_put(&nd.path);
} }
goto out;
}
return file;
out_path_put:
release_open_intent(&nd);
path_put(&nd.path);
out:
return ERR_PTR(err);
}
EXPORT_SYMBOL(open_exec); EXPORT_SYMBOL(open_exec);
int kernel_read(struct file *file, unsigned long offset, int kernel_read(struct file *file, unsigned long offset,