openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6 

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6:
  Restore LOOKUP_DIRECTORY hint handling in final lookup on open()
This commit is contained in:
Linus Torvalds 2010-03-26 15:06:02 -07:00
parent e1ee65d859 3e297b6134
commit e0df9c0b42
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
fs/namei.c
View File

@ -1610,8 +1610,7 @@ static struct file *finish_open(struct nameidata *nd,
static struct file *do_last(struct nameidata *nd, struct path *path, static struct file *do_last(struct nameidata *nd, struct path *path,
int open_flag, int acc_mode, int open_flag, int acc_mode,
int mode, const char *pathname, int mode, const char *pathname)
int *want_dir)
{ {
struct dentry *dir = nd->path.dentry; struct dentry *dir = nd->path.dentry;
struct file *filp; struct file *filp;
@ -1642,7 +1641,7 @@ static struct file *do_last(struct nameidata *nd, struct path *path,
if (nd->last.name[nd->last.len]) { if (nd->last.name[nd->last.len]) {
if (open_flag & O_CREAT) if (open_flag & O_CREAT)
goto exit; goto exit;
*want_dir = 1; nd->flags |= LOOKUP_DIRECTORY;
} }
/* just plain open? */ /* just plain open? */
@ -1656,8 +1655,10 @@ static struct file *do_last(struct nameidata *nd, struct path *path,
if (path->dentry->d_inode->i_op->follow_link) if (path->dentry->d_inode->i_op->follow_link)
return NULL; return NULL;
error = -ENOTDIR; error = -ENOTDIR;
if (*want_dir && !path->dentry->d_inode->i_op->lookup) if (nd->flags & LOOKUP_DIRECTORY) {
goto exit_dput; if (!path->dentry->d_inode->i_op->lookup)
goto exit_dput;
}
path_to_nameidata(path, nd); path_to_nameidata(path, nd);
audit_inode(pathname, nd->path.dentry); audit_inode(pathname, nd->path.dentry);
goto ok; goto ok;
@ -1766,7 +1767,6 @@ struct file *do_filp_open(int dfd, const char *pathname,
int count = 0; int count = 0;
int flag = open_to_namei_flags(open_flag); int flag = open_to_namei_flags(open_flag);
int force_reval = 0; int force_reval = 0;
int want_dir = open_flag & O_DIRECTORY;
if (!(open_flag & O_CREAT)) if (!(open_flag & O_CREAT))
mode = 0; mode = 0;
@ -1828,7 +1828,9 @@ struct file *do_filp_open(int dfd, const char *pathname,
if (open_flag & O_EXCL) if (open_flag & O_EXCL)
nd.flags |= LOOKUP_EXCL; nd.flags |= LOOKUP_EXCL;
} }
filp = do_last(&nd, &path, open_flag, acc_mode, mode, pathname, &want_dir); if (open_flag & O_DIRECTORY)
nd.flags |= LOOKUP_DIRECTORY;
filp = do_last(&nd, &path, open_flag, acc_mode, mode, pathname);
while (unlikely(!filp)) { /* trailing symlink */ while (unlikely(!filp)) { /* trailing symlink */
struct path holder; struct path holder;
struct inode *inode = path.dentry->d_inode; struct inode *inode = path.dentry->d_inode;
@ -1866,7 +1868,7 @@ struct file *do_filp_open(int dfd, const char *pathname,
} }
holder = path; holder = path;
nd.flags &= ~LOOKUP_PARENT; nd.flags &= ~LOOKUP_PARENT;
filp = do_last(&nd, &path, open_flag, acc_mode, mode, pathname, &want_dir); filp = do_last(&nd, &path, open_flag, acc_mode, mode, pathname);
if (inode->i_op->put_link) if (inode->i_op->put_link)
inode->i_op->put_link(holder.dentry, &nd, cookie); inode->i_op->put_link(holder.dentry, &nd, cookie);
path_put(&holder); path_put(&holder);