Commit af2f5542 authored May 21, 2012 by Miklos Szeredi Committed by Al Viro Jun 01, 2012

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>

parent 54c33e7f

fs/namei.c

+3 −0

Original line number	Diff line number	Diff line
		@@ -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;