From: Kinglong Mee <kinglongmee@gmail.com>
To: "J. Bruce Fields" <bfields@fieldses.org>,
Trond Myklebust <trond.myklebust@primarydata.com>
Cc: Linux NFS Mailing List <linux-nfs@vger.kernel.org>
Subject: [PATCH] SUNRPC: fix a memory leak for tcp NFSv4.1 backchannel
Date: Mon, 06 Jan 2014 17:33:22 +0800 [thread overview]
Message-ID: <52CA7862.1020203@gmail.com> (raw)
xs_setup_bc_tcp may return an existing xprt with non-NULL servername.
xprt_create_transport should not kstrdup servername for it.
Otherwise, those memory for servername will be leaked.
Signed-off-by: Kinglong Mee <kinglongmee@gmail.com>
---
net/sunrpc/xprt.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/net/sunrpc/xprt.c b/net/sunrpc/xprt.c
index ddd198e..6fa966f 100644
--- a/net/sunrpc/xprt.c
+++ b/net/sunrpc/xprt.c
@@ -1339,7 +1339,11 @@ found:
xprt_destroy(xprt);
return ERR_PTR(-EINVAL);
}
- xprt->servername = kstrdup(args->servername, GFP_KERNEL);
+
+ /* servername may not be NULL for tcp NFSv4.1 backchannel */
+ if (xprt->servername == NULL)
+ xprt->servername = kstrdup(args->servername, GFP_KERNEL);
+
if (xprt->servername == NULL) {
xprt_destroy(xprt);
return ERR_PTR(-ENOMEM);
--
1.8.4.2
next reply other threads:[~2014-01-06 9:33 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-01-06 9:33 Kinglong Mee [this message]
2014-01-06 18:49 ` [PATCH] SUNRPC: fix a memory leak for tcp NFSv4.1 backchannel J. Bruce Fields
2014-01-06 22:40 ` Trond Myklebust
2014-01-06 22:53 ` Dr Fields James Bruce
2014-01-06 23:28 ` Trond Myklebust
2014-01-07 5:07 ` Kinglong Mee
2014-01-09 10:31 ` [PATCH 0/5] NFSD/SUNRPC: Fix some bugs which cause memory leak for the backchannel Kinglong Mee
2014-01-09 10:31 ` [PATCH 1/5] NFSD: Using free_conn free connection Kinglong Mee
2014-01-09 10:32 ` [PATCH 2/5] NFSD: Free backchannel xprt in bc_destroy Kinglong Mee
2014-01-09 10:32 ` [PATCH 3/5] SUNRPC: New helper for creating client with rpc_xprt Kinglong Mee
2014-01-09 10:33 ` [PATCH 4/5] NFSD/SUNRPC: Check rpc_xprt out of xs_setup_bc_tcp Kinglong Mee
2014-01-09 16:26 ` Dr Fields James Bruce
2014-01-09 17:27 ` Trond Myklebust
2014-01-10 2:41 ` Kinglong Mee
2014-01-27 23:08 ` Dr Fields James Bruce
2014-02-11 12:08 ` Kinglong Mee
2014-01-09 10:33 ` [PATCH 5/5] SUNRPC: Clear xpt_bc_xprt if xs_setup_bc_tcp failed Kinglong Mee
2014-01-09 15:57 ` [PATCH] SUNRPC: fix a memory leak for tcp NFSv4.1 backchannel Dr Fields James Bruce
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=52CA7862.1020203@gmail.com \
--to=kinglongmee@gmail.com \
--cc=bfields@fieldses.org \
--cc=linux-nfs@vger.kernel.org \
--cc=trond.myklebust@primarydata.com \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).