summaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorTrond Myklebust <Trond.Myklebust@netapp.com>2012-10-11 14:36:52 -0400
committerTrond Myklebust <Trond.Myklebust@netapp.com>2012-10-15 10:49:43 -0400
commit1813badd98ce02e4b96d8997b68ddef4d4ad4ec5 (patch)
tree442fac9e179578c560ea113dddc877d8067ca9e4 /fs
parentd527e5c15de8de813cd0a2ad0b769f68c6226938 (diff)
downloadlinux-stable-1813badd98ce02e4b96d8997b68ddef4d4ad4ec5.tar.gz
linux-stable-1813badd98ce02e4b96d8997b68ddef4d4ad4ec5.tar.bz2
linux-stable-1813badd98ce02e4b96d8997b68ddef4d4ad4ec5.zip
NFSv4.1: Use kcalloc() to allocate zeroed arrays instead of kzalloc()
Don't circumvent the array size checks. Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Diffstat (limited to 'fs')
-rw-r--r--fs/nfs/nfs4filelayout.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/nfs/nfs4filelayout.c b/fs/nfs/nfs4filelayout.c
index e7aee566861d..2e45fd9c02a3 100644
--- a/fs/nfs/nfs4filelayout.c
+++ b/fs/nfs/nfs4filelayout.c
@@ -750,7 +750,7 @@ filelayout_decode_layout(struct pnfs_layout_hdr *flo,
goto out_err;
if (fl->num_fh > 0) {
- fl->fh_array = kzalloc(fl->num_fh * sizeof(struct nfs_fh *),
+ fl->fh_array = kcalloc(fl->num_fh, sizeof(fl->fh_array[0]),
gfp_flags);
if (!fl->fh_array)
goto out_err;