* [PATCH] fs: move permission check back into __lookup_hash
@ 2010-10-06 8:47 Christoph Hellwig
0 siblings, 0 replies; only message in thread
From: Christoph Hellwig @ 2010-10-06 8:47 UTC (permalink / raw)
To: viro; +Cc: linux-fsdevel
The caller that didn't need it is gone.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Index: linux-2.6/fs/namei.c
===================================================================
--- linux-2.6.orig/fs/namei.c 2010-09-20 12:20:15.152444173 -0300
+++ linux-2.6/fs/namei.c 2010-09-20 12:23:48.532444189 -0300
@@ -1121,11 +1121,13 @@ int vfs_path_lookup(struct dentry *dentr
static struct dentry *__lookup_hash(struct qstr *name,
struct dentry *base, struct nameidata *nd)
{
+ struct inode *inode = base->d_inode;
struct dentry *dentry;
- struct inode *inode;
int err;
- inode = base->d_inode;
+ err = exec_permission(inode);
+ if (err)
+ return ERR_PTR(err);
/*
* See if the low-level filesystem might want
@@ -1161,11 +1159,6 @@ out:
*/
static struct dentry *lookup_hash(struct nameidata *nd)
{
- int err;
-
- err = exec_permission(nd->path.dentry->d_inode);
- if (err)
- return ERR_PTR(err);
return __lookup_hash(&nd->last, nd->path.dentry, nd);
}
@@ -1213,9 +1206,6 @@ struct dentry *lookup_one_len(const char
if (err)
return ERR_PTR(err);
- err = exec_permission(base->d_inode);
- if (err)
- return ERR_PTR(err);
return __lookup_hash(&this, base, NULL);
}
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2010-10-06 8:47 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-10-06 8:47 [PATCH] fs: move permission check back into __lookup_hash Christoph Hellwig
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).