| From cec765cf5891c7fc3d905832b481bfb6fd55825d Mon Sep 17 00:00:00 2001 |
| From: Andy Adamson <andros@netapp.com> |
| Date: Mon, 13 Jun 2011 18:36:17 -0400 |
| Subject: NFSv4.1: allow zero fh array in filelayout decode layout |
| |
| From: Andy Adamson <andros@netapp.com> |
| |
| commit cec765cf5891c7fc3d905832b481bfb6fd55825d upstream. |
| |
| Signed-off-by: Andy Adamson <andros@netapp.com> |
| Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> |
| |
| --- |
| fs/nfs/nfs4filelayout.c | 15 ++++++++++----- |
| 1 file changed, 10 insertions(+), 5 deletions(-) |
| |
| --- a/fs/nfs/nfs4filelayout.c |
| +++ b/fs/nfs/nfs4filelayout.c |
| @@ -554,13 +554,18 @@ filelayout_decode_layout(struct pnfs_lay |
| __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; |
| |
| - fl->fh_array = kzalloc(fl->num_fh * sizeof(struct nfs_fh *), |
| - gfp_flags); |
| - if (!fl->fh_array) |
| - 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? */ |
