xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
[ 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: 573c4e1ef5 ("NFS: Simplify ->decode_dirent() calling sequence")
Signed-off-by: Trond Myklebust <trond.myklebust@hammerspace.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Trond Myklebust
2022-02-24 10:59:37 -05:00
committed by Greg Kroah-Hartman
parent 7b59afe84a
commit 2f3885514e
2 changed files with 7 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
fs/nfs/nfs2xdr.c
View File

@@ -948,7 +948,7 @@ int nfs2_decode_dirent(struct xdr_stream *xdr, struct nfs_entry *entry,
error = decode_filename_inline(xdr, &entry->name, &entry->len); error = decode_filename_inline(xdr, &entry->name, &entry->len);
if (unlikely(error)) if (unlikely(error))
return error; return -EAGAIN;
/* /*
* The type (size and byte order) of nfscookie isn't defined in * The type (size and byte order) of nfscookie isn't defined in

21
fs/nfs/nfs3xdr.c
View File

@@ -1964,7 +1964,6 @@ int nfs3_decode_dirent(struct xdr_stream *xdr, struct nfs_entry *entry,
bool plus) bool plus)
{ {
struct user_namespace *userns = rpc_userns(entry->server->client); struct user_namespace *userns = rpc_userns(entry->server->client);
struct nfs_entry old = *entry;
__be32 *p; __be32 *p;
int error; int error;
u64 new_cookie; u64 new_cookie;
@@ -1984,15 +1983,15 @@ int nfs3_decode_dirent(struct xdr_stream *xdr, struct nfs_entry *entry,
error = decode_fileid3(xdr, &entry->ino); error = decode_fileid3(xdr, &entry->ino);
if (unlikely(error)) if (unlikely(error))
return error; return -EAGAIN;
error = decode_inline_filename3(xdr, &entry->name, &entry->len); error = decode_inline_filename3(xdr, &entry->name, &entry->len);
if (unlikely(error)) if (unlikely(error))
return error; return -EAGAIN;
error = decode_cookie3(xdr, &new_cookie); error = decode_cookie3(xdr, &new_cookie);
if (unlikely(error)) if (unlikely(error))
return error; return -EAGAIN;
entry->d_type = DT_UNKNOWN; entry->d_type = DT_UNKNOWN;
@@ -2000,7 +1999,7 @@ int nfs3_decode_dirent(struct xdr_stream *xdr, struct nfs_entry *entry,
entry->fattr->valid = 0; entry->fattr->valid = 0;
error = decode_post_op_attr(xdr, entry->fattr, userns); error = decode_post_op_attr(xdr, entry->fattr, userns);
if (unlikely(error)) if (unlikely(error))
return error; return -EAGAIN;
if (entry->fattr->valid & NFS_ATTR_FATTR_V3) if (entry->fattr->valid & NFS_ATTR_FATTR_V3)
entry->d_type = nfs_umode_to_dtype(entry->fattr->mode); entry->d_type = nfs_umode_to_dtype(entry->fattr->mode);
@@ -2015,11 +2014,8 @@ int nfs3_decode_dirent(struct xdr_stream *xdr, struct nfs_entry *entry,
return -EAGAIN; return -EAGAIN;
if (*p != xdr_zero) { if (*p != xdr_zero) {
error = decode_nfs_fh3(xdr, entry->fh); error = decode_nfs_fh3(xdr, entry->fh);
if (unlikely(error)) { if (unlikely(error))
if (error == -E2BIG) return -EAGAIN;
goto out_truncated;
return error;
}
} else } else
zero_nfs_fh3(entry->fh); zero_nfs_fh3(entry->fh);
} }
@@ -2028,11 +2024,6 @@ int nfs3_decode_dirent(struct xdr_stream *xdr, struct nfs_entry *entry,
entry->cookie = new_cookie; entry->cookie = new_cookie;
return 0; return 0;
out_truncated:
dprintk("NFS: directory entry contains invalid file handle\n");
*entry = old;
return -EAGAIN;
} }
/* /*