From 986597e299363e6d084fe82f54621659bc26f26a Mon Sep 17 00:00:00 2001
From: Dan Carpenter <dan.carpenter@oracle.com>
Date: Tue, 12 Jun 2012 10:37:08 +0300
Subject: [PATCH] --- yaml --- r: 310960 b: refs/heads/master c:
 0439f31c35d1da0b28988b308ea455e38e6a350d h: refs/heads/master v: v3

---
 [refs]                      | 2 +-
 trunk/fs/nfs/callback_xdr.c | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 36fc05c2c9dc..23df4e46baf4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 92123e068efa310b09e9943ac1cfd10ff6b6d2e4
+refs/heads/master: 0439f31c35d1da0b28988b308ea455e38e6a350d
diff --git a/trunk/fs/nfs/callback_xdr.c b/trunk/fs/nfs/callback_xdr.c
index 95bfc243992c..27c2969a9d02 100644
--- a/trunk/fs/nfs/callback_xdr.c
+++ b/trunk/fs/nfs/callback_xdr.c
@@ -455,9 +455,9 @@ static __be32 decode_cb_sequence_args(struct svc_rqst *rqstp,
 	args->csa_nrclists = ntohl(*p++);
 	args->csa_rclists = NULL;
 	if (args->csa_nrclists) {
-		args->csa_rclists = kmalloc(args->csa_nrclists *
-					    sizeof(*args->csa_rclists),
-					    GFP_KERNEL);
+		args->csa_rclists = kmalloc_array(args->csa_nrclists,
+						  sizeof(*args->csa_rclists),
+						  GFP_KERNEL);
 		if (unlikely(args->csa_rclists == NULL))
 			goto out;