aboutsummaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorChristoph Hellwig <hch@lst.de>2008-05-19 01:53:34 -0400
committerAl Viro <viro@zeniv.linux.org.uk>2008-07-26 20:53:29 -0400
commite56b6a5dda1a36ffaa532df6f975ea324298fa4d (patch)
tree700077a8ea298076d1a90e581ea577f4ad27d2dd /fs
parentbeb29e058c35ab69e96e455a12ccf7505f6de425 (diff)
Re: [PATCH 3/6] vfs: open_exec cleanup
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>
Diffstat (limited to 'fs')
-rw-r--r--fs/exec.c58
1 files changed, 30 insertions, 28 deletions
diff --git a/fs/exec.c b/fs/exec.c
index 0ba5d355c5a1..346e3f69c6e0 100644
--- a/fs/exec.c
+++ b/fs/exec.c
@@ -656,38 +656,40 @@ EXPORT_SYMBOL(setup_arg_pages);
656struct file *open_exec(const char *name) 656struct file *open_exec(const char *name)
657{ 657{
658 struct nameidata nd; 658 struct nameidata nd;
659 int err;
660 struct file *file; 659 struct file *file;
660 int err;
661 661
662 err = path_lookup_open(AT_FDCWD, name, LOOKUP_FOLLOW, &nd, FMODE_READ|FMODE_EXEC); 662 err = path_lookup_open(AT_FDCWD, name, LOOKUP_FOLLOW, &nd,
663 file = ERR_PTR(err); 663 FMODE_READ|FMODE_EXEC);
664 664 if (err)
665 if (!err) { 665 goto out;
666 struct inode *inode = nd.path.dentry->d_inode; 666
667 file = ERR_PTR(-EACCES); 667 err = -EACCES;
668 if (S_ISREG(inode->i_mode)) { 668 if (!S_ISREG(nd.path.dentry->d_inode->i_mode))
669 int err = vfs_permission(&nd, MAY_EXEC | MAY_OPEN); 669 goto out_path_put;
670 file = ERR_PTR(err); 670
671 if (!err) { 671 err = vfs_permission(&nd, MAY_EXEC | MAY_OPEN);
672 file = nameidata_to_filp(&nd, 672 if (err)
673 O_RDONLY|O_LARGEFILE); 673 goto out_path_put;
674 if (!IS_ERR(file)) { 674
675 err = deny_write_access(file); 675 file = nameidata_to_filp(&nd, O_RDONLY|O_LARGEFILE);
676 if (err) { 676 if (IS_ERR(file))
677 fput(file); 677 return file;
678 file = ERR_PTR(err); 678
679 } 679 err = deny_write_access(file);
680 } 680 if (err) {
681out: 681 fput(file);
682 return file; 682 goto out;
683 }
684 }
685 release_open_intent(&nd);
686 path_put(&nd.path);
687 } 683 }
688 goto out;
689}
690 684
685 return file;
686
687 out_path_put:
688 release_open_intent(&nd);
689 path_put(&nd.path);
690 out:
691 return ERR_PTR(err);
692}
691EXPORT_SYMBOL(open_exec); 693EXPORT_SYMBOL(open_exec);
692 694
693int kernel_read(struct file *file, unsigned long offset, 695int kernel_read(struct file *file, unsigned long offset,