lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

move may_open() from __open_name_create() to do_last()

Browse Source 
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
This commit is contained in:
Al Viro
2011-03-09 00:17:27 -05:00
parent 0f9d1a10c3
commit 9b44f1b392
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
fs/namei.c
View File

@@ -2069,11 +2069,7 @@ out_unlock:
mutex_unlock(&dir->d_inode->i_mutex); mutex_unlock(&dir->d_inode->i_mutex);
dput(nd->path.dentry); dput(nd->path.dentry);
nd->path.dentry = path->dentry; nd->path.dentry = path->dentry;
return error;
if (error)
return error;
/* Don't check for write permission, don't truncate */
return may_open(&nd->path, 0, open_flag & ~O_TRUNC);
} }
/* /*
@@ -2239,6 +2235,12 @@ static struct file *do_last(struct nameidata *nd, struct path *path,
mnt_drop_write(nd->path.mnt); mnt_drop_write(nd->path.mnt);
goto exit; goto exit;
} }
/* Don't check for write permission, don't truncate */
error = may_open(&nd->path, 0, op->open_flag & ~O_TRUNC);
if (error) {
mnt_drop_write(nd->path.mnt);
goto exit;
}
filp = nameidata_to_filp(nd); filp = nameidata_to_filp(nd);
mnt_drop_write(nd->path.mnt); mnt_drop_write(nd->path.mnt);
path_put(&nd->path); path_put(&nd->path);