From 354af3d2b03156101fc9f3baa8cefdd5d45464d3 Mon Sep 17 00:00:00 2001 From: Miklos Szeredi Date: Mon, 26 Mar 2012 12:54:21 +0200 Subject: [PATCH] --- yaml --- r: 298370 b: refs/heads/master c: cda309de253f338b04d15b4478e45fc3a0fcc7a3 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/fs/namei.c | 11 +++++------ 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index 735aa658a200..b725462c62b2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3637c05d881b2b7bab36f339245b8963f5b29c9f +refs/heads/master: cda309de253f338b04d15b4478e45fc3a0fcc7a3 diff --git a/trunk/fs/namei.c b/trunk/fs/namei.c index 82f9568d315d..907e24785576 100644 --- a/trunk/fs/namei.c +++ b/trunk/fs/namei.c @@ -1849,13 +1849,7 @@ int vfs_path_lookup(struct dentry *dentry, struct vfsmount *mnt, static struct dentry *__lookup_hash(struct qstr *name, struct dentry *base, struct nameidata *nd) { - struct inode *inode = base->d_inode; struct dentry *dentry; - int err; - - err = inode_permission(inode, MAY_EXEC); - if (err) - return ERR_PTR(err); /* * Don't bother with __d_lookup: callers are for creat as @@ -1922,6 +1916,7 @@ struct dentry *lookup_one_len(const char *name, struct dentry *base, int len) { struct qstr this; unsigned int c; + int err; WARN_ON_ONCE(!mutex_is_locked(&base->d_inode->i_mutex)); @@ -1946,6 +1941,10 @@ struct dentry *lookup_one_len(const char *name, struct dentry *base, int len) return ERR_PTR(err); } + err = inode_permission(base->d_inode, MAY_EXEC); + if (err) + return ERR_PTR(err); + return __lookup_hash(&this, base, NULL); }