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

Commit cec765cf authored by Andy Adamson's avatar Andy Adamson Committed by Trond Myklebust
Browse files

NFSv4.1: allow zero fh array in filelayout decode layout 



Signed-off-by: default avatarAndy Adamson <andros@netapp.com>
cc:stable@kernel.org [2.6.39]
Signed-off-by: default avatarTrond Myklebust <Trond.Myklebust@netapp.com>
parent 533eb461

fs/nfs/nfs4filelayout.c

+10 −5
Original line number Diff line number Diff line
@@ -552,13 +552,18 @@ filelayout_decode_layout(struct pnfs_layout_hdr *flo, 
		__func__, nfl_util, fl->num_fh, fl->first_stripe_index,

		fl->pattern_offset);



	if (!fl->num_fh)

	/* Note that a zero value for num_fh is legal for STRIPE_SPARSE.

	 * Futher checking is done in filelayout_check_layout */

	if (fl->num_fh < 0 || fl->num_fh >

	    max(NFS4_PNFS_MAX_STRIPE_CNT, NFS4_PNFS_MAX_MULTI_CNT))

		goto out_err;



	if (fl->num_fh > 0) {

		fl->fh_array = kzalloc(fl->num_fh * sizeof(struct nfs_fh *),

				       gfp_flags);

		if (!fl->fh_array)

			goto out_err;

	}



	for (i = 0; i < fl->num_fh; i++) {

		/* Do we want to use a mempool here? */