From: J. Bruce Fields <bfields@redhat.com>
Date: Mon, 3 Feb 2014 21:31:42 +0000 (-0500)
Subject: nfsd4: fix test_stateid error reply encoding
X-Git-Tag: firefly_0821_release~176^2~4099^2~31
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=a11fcce1544df08c723d950ff0edef3adac40405;p=firefly-linux-kernel-4.4.55.git

nfsd4: fix test_stateid error reply encoding

If the entire operation fails then there's nothing to encode.

Cc: stable@vger.kernel.org
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
---

diff --git a/fs/nfsd/nfs4xdr.c b/fs/nfsd/nfs4xdr.c
index de7bc8f7c106..aa04a6a98bd5 100644
--- a/fs/nfsd/nfs4xdr.c
+++ b/fs/nfsd/nfs4xdr.c
@@ -3473,6 +3473,9 @@ nfsd4_encode_test_stateid(struct nfsd4_compoundres *resp, __be32 nfserr,
 	struct nfsd4_test_stateid_id *stateid, *next;
 	__be32 *p;
 
+	if (nfserr)
+		return nfserr;
+
 	RESERVE_SPACE(4 + (4 * test_stateid->ts_num_ids));
 	*p++ = htonl(test_stateid->ts_num_ids);