Commit 973d4b73 authored by Al Viro's avatar Al Viro
Browse files

do_last(): rejoin the common path even earlier in FMODE_{OPENED,CREATED} case 



... getting may_create_in_sticky() checks in FMODE_OPENED case as well.

Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent 8795e7d4

fs/namei.c

+4 −10
Original line number Diff line number Diff line
@@ -3199,14 +3199,7 @@ static const char *do_last(struct nameidata *nd, 
	if (IS_ERR(dentry))

		return ERR_CAST(dentry);



	if (file->f_mode & FMODE_OPENED) {

		audit_inode(nd->name, file->f_path.dentry, 0);

		dput(nd->path.dentry);

		nd->path.dentry = dentry;

		goto finish_open_created;

	}



	if (file->f_mode & FMODE_CREATED) {

	if (file->f_mode & (FMODE_OPENED | FMODE_CREATED)) {

		dput(nd->path.dentry);

		nd->path.dentry = dentry;

		goto finish_open_created;
@@ -3230,6 +3223,8 @@ static const char *do_last(struct nameidata *nd, 
	error = complete_walk(nd);

	if (error)

		return ERR_PTR(error);

finish_open_created:

	if (!(file->f_mode & FMODE_CREATED))

		audit_inode(nd->name, nd->path.dentry, 0);

	if (open_flag & O_CREAT) {

		if (d_is_dir(nd->path.dentry))
@@ -3242,7 +3237,6 @@ static const char *do_last(struct nameidata *nd, 
	if ((nd->flags & LOOKUP_DIRECTORY) && !d_can_lookup(nd->path.dentry))

		return ERR_PTR(-ENOTDIR);



finish_open_created:

	do_truncate = false;

	acc_mode = op->acc_mode;

	if (file->f_mode & FMODE_CREATED) {