From: Trond Myklebust <trond.myklebust@primarydata.com>
Date: Wed, 11 Feb 2015 22:27:55 +0000 (-0500)
Subject: NFSv4.1: Fix a kfree() of uninitialised pointers in decode_cb_sequence_args
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=d8ba1f971497c19cf80da1ea5391a46a5f9fbd41;p=linux-beck.git

NFSv4.1: Fix a kfree() of uninitialised pointers in decode_cb_sequence_args

If the call to decode_rc_list() fails due to a memory allocation error,
then we need to truncate the array size to ensure that we only call
kfree() on those pointer that were allocated.

Reported-by: David Ramos <daramos@stanford.edu>
Fixes: 4aece6a19cf7f ("nfs41: cb_sequence xdr implementation")
Cc: stable@vger.kernel.org
Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>
---

diff --git a/fs/nfs/callback_xdr.c b/fs/nfs/callback_xdr.c
index f4ccfe6521ec..02f8d09e119f 100644
--- a/fs/nfs/callback_xdr.c
+++ b/fs/nfs/callback_xdr.c
@@ -464,8 +464,10 @@ static __be32 decode_cb_sequence_args(struct svc_rqst *rqstp,
 
 		for (i = 0; i < args->csa_nrclists; i++) {
 			status = decode_rc_list(xdr, &args->csa_rclists[i]);
-			if (status)
+			if (status) {
+				args->csa_nrclists = i;
 				goto out_free;
+			}
 		}
 	}
 	status = 0;