Commit 4bbcbd3b authored by David Howells's avatar David Howells Committed by Al Viro

VFS: Make pathwalk use d_is_reg() rather than S_ISREG()

Make pathwalk use d_is_reg() rather than S_ISREG() to determine whether to
honour O_TRUNC.  Since this occurs after complete_walk(), the dentry type
field cannot change and the inode pointer cannot change as we hold a ref on
the dentry, so this should be safe.
Signed-off-by: default avatarDavid Howells <dhowells@redhat.com>
Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent 7ceab50c
...@@ -3077,7 +3077,7 @@ static int do_last(struct nameidata *nd, struct path *path, ...@@ -3077,7 +3077,7 @@ static int do_last(struct nameidata *nd, struct path *path,
error = -ENOTDIR; error = -ENOTDIR;
if ((nd->flags & LOOKUP_DIRECTORY) && !d_can_lookup(nd->path.dentry)) if ((nd->flags & LOOKUP_DIRECTORY) && !d_can_lookup(nd->path.dentry))
goto out; goto out;
if (!S_ISREG(nd->inode->i_mode)) if (!d_is_reg(nd->path.dentry))
will_truncate = false; will_truncate = false;
if (will_truncate) { if (will_truncate) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment