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

Commit fc1794c5 authored by Fred Isaman's avatar Fred Isaman Committed by Trond Myklebust
Browse files

pnfs: check that partial LAYOUTGET return is ignored 



Either a bad server reply, or our ignoring of multiple array segments in
a reply, can cause a reply to not meet our requirements.  Ensure
that we ignore such replies.

Signed-off-by: default avatarFred Isaman <iisaman@netapp.com>
Signed-off-by: default avatarTrond Myklebust <Trond.Myklebust@netapp.com>
parent 2130ff66

fs/nfs/pnfs.c

+11 −0
Original line number Diff line number Diff line
@@ -660,6 +660,17 @@ pnfs_layout_process(struct nfs4_layoutget *lgp) 
	struct inode *ino = lo->plh_inode;

	int status = 0;



	/* Verify we got what we asked for.

	 * Note that because the xdr parsing only accepts a single

	 * element array, this can fail even if the server is behaving

	 * correctly.

	 */

	if (lgp->args.range.iomode > res->range.iomode ||

	    res->range.offset != 0 ||

	    res->range.length != NFS4_MAX_UINT64) {

		status = -EINVAL;

		goto out;

	}

	/* Inject layout blob into I/O device driver */

	lseg = NFS_SERVER(ino)->pnfs_curr_ld->alloc_lseg(lo, res);

	if (!lseg || IS_ERR(lseg)) {