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

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

NFS: Return valid errors from nfs2/3_decode_dirent() 



[ Upstream commit 64cfca85bacde54caa64e0ab855c48734894fa37 ]

Valid return values for decode_dirent() callback functions are:
 0: Success
 -EBADCOOKIE: End of directory
 -EAGAIN: End of xdr_stream

All errors need to map into one of those three values.

Fixes: 573c4e1e ("NFS: Simplify ->decode_dirent() calling sequence")
Signed-off-by: default avatarTrond Myklebust <trond.myklebust@hammerspace.com>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 546604de

fs/nfs/nfs2xdr.c

+1 −1
Original line number Diff line number Diff line
@@ -953,7 +953,7 @@ int nfs2_decode_dirent(struct xdr_stream *xdr, struct nfs_entry *entry, 


	error = decode_filename_inline(xdr, &entry->name, &entry->len);

	if (unlikely(error))

		return error;

		return -EAGAIN;



	/*

	 * The type (size and byte order) of nfscookie isn't defined in

fs/nfs/nfs3xdr.c

+6 −15
Original line number Diff line number Diff line
@@ -1968,7 +1968,6 @@ int nfs3_decode_dirent(struct xdr_stream *xdr, struct nfs_entry *entry, 
		       bool plus)

{

	struct user_namespace *userns = rpc_userns(entry->server->client);

	struct nfs_entry old = *entry;

	__be32 *p;

	int error;

	u64 new_cookie;
@@ -1988,15 +1987,15 @@ int nfs3_decode_dirent(struct xdr_stream *xdr, struct nfs_entry *entry, 


	error = decode_fileid3(xdr, &entry->ino);

	if (unlikely(error))

		return error;

		return -EAGAIN;



	error = decode_inline_filename3(xdr, &entry->name, &entry->len);

	if (unlikely(error))

		return error;

		return -EAGAIN;



	error = decode_cookie3(xdr, &new_cookie);

	if (unlikely(error))

		return error;

		return -EAGAIN;



	entry->d_type = DT_UNKNOWN;
@@ -2004,7 +2003,7 @@ int nfs3_decode_dirent(struct xdr_stream *xdr, struct nfs_entry *entry, 
		entry->fattr->valid = 0;

		error = decode_post_op_attr(xdr, entry->fattr, userns);

		if (unlikely(error))

			return error;

			return -EAGAIN;

		if (entry->fattr->valid & NFS_ATTR_FATTR_V3)

			entry->d_type = nfs_umode_to_dtype(entry->fattr->mode);
@@ -2019,11 +2018,8 @@ int nfs3_decode_dirent(struct xdr_stream *xdr, struct nfs_entry *entry, 
			return -EAGAIN;

		if (*p != xdr_zero) {

			error = decode_nfs_fh3(xdr, entry->fh);

			if (unlikely(error)) {

				if (error == -E2BIG)

					goto out_truncated;

				return error;

			}

			if (unlikely(error))

				return -EAGAIN;

		} else

			zero_nfs_fh3(entry->fh);

	}
@@ -2032,11 +2028,6 @@ int nfs3_decode_dirent(struct xdr_stream *xdr, struct nfs_entry *entry, 
	entry->cookie = new_cookie;



	return 0;



out_truncated:

	dprintk("NFS: directory entry contains invalid file handle\n");

	*entry = old;

	return -EAGAIN;

}



/*