mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-09-27 12:57:53 +00:00
Code Issues Releases Wiki Activity

do_last(): merge the may_open() calls

Browse source 
have FMODE_OPENED case rejoin the main path at earlier point

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
This commit is contained in:
Al Viro 2020-01-26 10:06:13 -05:00
parent 7be219b4dc
commit 3ad5615a07
1 changed files with 3 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
fs/namei.c
View file

@ -3207,10 +3207,7 @@ static const char *do_last(struct nameidata *nd,
audit_inode(nd->name, file->f_path.dentry, 0);
dput(nd->path.dentry);
nd->path.dentry = dentry;
error = may_open(&nd->path, acc_mode, open_flag);
if (error)
goto out;
goto opened;
goto finish_open_created;
}
if (file->f_mode & FMODE_CREATED) {
@ -3277,11 +3274,10 @@ static const char *do_last(struct nameidata *nd,
error = may_open(&nd->path, acc_mode, open_flag);
if (error)
goto out;
BUG_ON(file->f_mode & FMODE_OPENED); /* once it's opened, it's opened */
error = vfs_open(&nd->path, file);
if (!(file->f_mode & FMODE_OPENED))
error = vfs_open(&nd->path, file);
if (error)
goto out;
opened:
error = ima_file_check(file, op->acc_mode);
if (!error && will_truncate)
error = handle_truncate(file);