From: Yan, Zheng <zheng.z.yan@intel.com>
Date: Mon, 10 Mar 2014 04:52:07 +0000 (+0800)
Subject: nfsd4: fix memory leak in nfsd4_encode_fattr()
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=647183f379be5a197f3df3a469321de4fe532e54;p=karo-tx-linux.git

nfsd4: fix memory leak in nfsd4_encode_fattr()

commit 18df11d0eacf67bbcd8dda755b568bbbd7264735 upstream.

fh_put() does not free the temporary file handle.

Signed-off-by: Yan, Zheng <zheng.z.yan@intel.com>
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

diff --git a/fs/nfsd/nfs4xdr.c b/fs/nfsd/nfs4xdr.c
index d21435976a02..16e8fa71eb84 100644
--- a/fs/nfsd/nfs4xdr.c
+++ b/fs/nfsd/nfs4xdr.c
@@ -2501,8 +2501,10 @@ out:
 		security_release_secctx(context, contextlen);
 #endif /* CONFIG_NFSD_V4_SECURITY_LABEL */
 	kfree(acl);
-	if (tempfh)
+	if (tempfh) {
 		fh_put(tempfh);
+		kfree(tempfh);
+	}
 	return status;
 out_nfserr:
 	status = nfserrno(err);