Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0dfacee4 authored by Trond Myklebust's avatar Trond Myklebust Committed by Greg Kroah-Hartman
Browse files

NFSv4: Handle case where the lookup of a directory fails 



commit ac795161c93699d600db16c1a8cc23a65a1eceaf upstream.

If the application sets the O_DIRECTORY flag, and tries to open a
regular file, nfs_atomic_open() will punt to doing a regular lookup.
If the server then returns a regular file, we will happily return a
file descriptor with uninitialised open state.

The fix is to return the expected ENOTDIR error in these cases.

Reported-by: default avatarLyu Tao <tao.lyu@epfl.ch>
Fixes: 0dd2b474 ("nfs: implement i_op->atomic_open()")
Signed-off-by: default avatarTrond Myklebust <trond.myklebust@hammerspace.com>
Signed-off-by: default avatarAnna Schumaker <Anna.Schumaker@Netapp.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent c27abaa0

fs/nfs/dir.c

+13 −0
Original line number Diff line number Diff line
@@ -1638,6 +1638,19 @@ int nfs_atomic_open(struct inode *dir, struct dentry *dentry, 


no_open:

	res = nfs_lookup(dir, dentry, lookup_flags);

	if (!res) {

		inode = d_inode(dentry);

		if ((lookup_flags & LOOKUP_DIRECTORY) && inode &&

		    !S_ISDIR(inode->i_mode))

			res = ERR_PTR(-ENOTDIR);

	} else if (!IS_ERR(res)) {

		inode = d_inode(res);

		if ((lookup_flags & LOOKUP_DIRECTORY) && inode &&

		    !S_ISDIR(inode->i_mode)) {

			dput(res);

			res = ERR_PTR(-ENOTDIR);

		}

	}

	if (switched) {

		d_lookup_done(dentry);

		if (!res)