All of lore.kernel.org
 help / color / mirror / Atom feed
From: NeilBrown <neilb@suse.com>
To: Steve Dickson <SteveD@redhat.com>
Cc: "J. Bruce Fields" <bfields@fieldses.org>,
	Linux NFS Mailing list <linux-nfs@vger.kernel.org>
Subject: [PATCH 5/7] mount: fix memory leak in v4root_add_parents
Date: Fri, 29 Jul 2016 15:03:36 +1000	[thread overview]
Message-ID: <146976861678.20186.788066493232715792.stgit@noble> (raw)
In-Reply-To: <146976807524.20186.8871903418718212567.stgit@noble>

If pseudofs_update failed, we weren't freeing 'path'.

Signed-off-by: NeilBrown <neilb@suse.com>
---
 utils/mountd/v4root.c |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/utils/mountd/v4root.c b/utils/mountd/v4root.c
index d52172592823..f978f4ceef01 100644
--- a/utils/mountd/v4root.c
+++ b/utils/mountd/v4root.c
@@ -152,6 +152,7 @@ static int v4root_add_parents(nfs_export *exp)
 	char *hostname = exp->m_export.e_hostname;
 	char *path;
 	char *ptr;
+	int ret = 0;
 
 	path = strdup(exp->m_export.e_path);
 	if (!path) {
@@ -160,19 +161,18 @@ static int v4root_add_parents(nfs_export *exp)
 		return -ENOMEM;
 	}
 	for (ptr = path; ptr; ptr = strchr(ptr, '/')) {
-		int ret;
 		char saved;
 
 		saved = *ptr;
 		*ptr = '\0';
 		ret = pseudofs_update(hostname, *path ? path : "/", exp);
 		if (ret)
-			return ret;
+			break;
 		*ptr = saved;
 		ptr++;
 	}
 	free(path);
-	return 0;
+	return ret;
 }
 
 /*



  reply	other threads:[~2016-07-29  5:05 UTC|newest]

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-07-29  5:03 [PATCH 0/7] Assorted mount/mountd nfs-utils patches - V2 NeilBrown
2016-07-29  5:03 ` NeilBrown [this message]
2016-07-29  5:03 ` [PATCH 3/7] mount: don't treat temporary name resolution failure as permanent NeilBrown
2016-07-29  5:03 ` [PATCH 4/7] mount: use a public address for IPv6 callback NeilBrown
2016-07-29  5:03 ` [PATCH 6/7] mountd: allow alternate ttl to be specified for dump_to_cache NeilBrown
2016-08-03 17:31   ` Steve Dickson
2016-08-03 17:59     ` Steve Dickson
2016-07-29  5:03 ` [PATCH 7/7] mountd: fail nfsd.export lookup for path to unmounted exportpoint NeilBrown
2016-07-29 19:04   ` J. Bruce Fields
2016-07-29  5:03 ` [PATCH 2/7] mountd: remove the --exports-file option NeilBrown
2016-07-29  5:03 ` [PATCH 1/7] nfs.man: clarify effect of 'retry' option NeilBrown
2016-07-29 19:05 ` [PATCH 0/7] Assorted mount/mountd nfs-utils patches - V2 J. Bruce Fields
2016-08-04 11:50 ` Steve Dickson
2016-08-04 12:06   ` NeilBrown
2016-08-04 17:29     ` Steve Dickson

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=146976861678.20186.788066493232715792.stgit@noble \
    --to=neilb@suse.com \
    --cc=SteveD@redhat.com \
    --cc=bfields@fieldses.org \
    --cc=linux-nfs@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.