vfs: do_last(): check LOOKUP_DIRECTORY

Check for ENOTDIR before finishing open.  This allows this code to be shared
between O_CREAT and plain opens.

Signed-off-by: Miklos Szeredi <mszeredi@suse.cz>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

1 files changed, 3 insertions, 0 deletions

diff --git a/fs/namei.c b/fs/namei.c
index a7e994bb78c2..4767c0588b6e 100644
--- a/fs/namei.c
+++ b/fs/namei.c
@@ -2386,6 +2386,9 @@ static struct file *do_last(struct nameidata *nd, struct path *path,
         error = -EISDIR;
         if (S_ISDIR(nd->inode->i_mode))
                 goto exit;
+        error = -ENOTDIR;
+        if ((nd->flags & LOOKUP_DIRECTORY) && !nd->inode->i_op->lookup)
+                goto exit;
 ok:
         if (!S_ISREG(nd->inode->i_mode))
                 will_truncate = 0;