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

Commit 852c95db authored by Olga Kornievskaia's avatar Olga Kornievskaia Committed by Greg Kroah-Hartman
Browse files

NFSv4 remove zero number of fs_locations entries error check 



[ Upstream commit 90e12a3191040bd3854d3e236c35921e4e92a044 ]

Remove the check for the zero length fs_locations reply in the
xdr decoding, and instead check for that in the migration code.

Signed-off-by: default avatarOlga Kornievskaia <kolga@netapp.com>
Signed-off-by: default avatarAnna Schumaker <Anna.Schumaker@Netapp.com>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 75e67eed

fs/nfs/nfs4state.c

+3 −0
Original line number Diff line number Diff line
@@ -2070,6 +2070,9 @@ static int nfs4_try_migration(struct nfs_server *server, const struct cred *cred 
	}



	result = -NFS4ERR_NXIO;

	if (!locations->nlocations)

		goto out;



	if (!(locations->fattr.valid & NFS_ATTR_FATTR_V4_LOCATIONS)) {

		dprintk("<-- %s: No fs_locations data, migration skipped\n",

			__func__);

fs/nfs/nfs4xdr.c

+0 −2
Original line number Diff line number Diff line
@@ -3683,8 +3683,6 @@ static int decode_attr_fs_locations(struct xdr_stream *xdr, uint32_t *bitmap, st 
	if (unlikely(!p))

		goto out_eio;

	n = be32_to_cpup(p);

	if (n <= 0)

		goto out_eio;

	for (res->nlocations = 0; res->nlocations < n; res->nlocations++) {

		u32 m;

		struct nfs4_fs_location *loc;