From: Chuck Lever <chuck.lever@oracle.com>
Date: Thu, 28 Oct 2010 17:10:48 +0000 (-0400)
Subject: mount.nfs: Fix memory leak in nfs_sys_mount()
X-Git-Tag: nfs-utils-1-2-4-rc2~3
X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=bc4a0c42570d5620cc1bb32428e16b9c9b5f3863;p=nfs-utils.git

mount.nfs: Fix memory leak in nfs_sys_mount()

This appears to have been left behind by last year's adjustments to
how the extra_opts string is constructed.

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Steve Dickson <steved@redhat.com>
---

diff --git a/utils/mount/stropts.c b/utils/mount/stropts.c
index 29b1aaa..ac81616 100644
--- a/utils/mount/stropts.c
+++ b/utils/mount/stropts.c
@@ -568,16 +568,18 @@ static int nfs_sys_mount(struct nfsmount_info *mi, struct mount_options *opts)
 	char *options = NULL;
 	int result;
 
+	if (mi->fake)
+		return 1;
+
 	if (po_join(opts, &options) == PO_FAILED) {
 		errno = EIO;
 		return 0;
 	}
 
-	if (mi->fake)
-		return 1;
-
 	result = mount(mi->spec, mi->node, mi->type,
 			mi->flags & ~(MS_USER|MS_USERS), options);
+	free(options);
+
 	if (verbose && result) {
 		int save = errno;
 		nfs_error(_("%s: mount(2): %s"), progname, strerror(save));