From patchwork Mon Jan 6 10:24:32 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kinglong Mee X-Patchwork-Id: 3437001 Return-Path: X-Original-To: patchwork-linux-nfs@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 61BB8C02DC for ; Mon, 6 Jan 2014 10:24:42 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 95B3920165 for ; Mon, 6 Jan 2014 10:24:41 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id D087020155 for ; Mon, 6 Jan 2014 10:24:40 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752600AbaAFKYi (ORCPT ); Mon, 6 Jan 2014 05:24:38 -0500 Received: from mail-pa0-f50.google.com ([209.85.220.50]:33931 "EHLO mail-pa0-f50.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752292AbaAFKYh (ORCPT ); Mon, 6 Jan 2014 05:24:37 -0500 Received: by mail-pa0-f50.google.com with SMTP id kp14so16616675pab.9 for ; Mon, 06 Jan 2014 02:24:37 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=message-id:date:from:user-agent:mime-version:to:subject :content-type:content-transfer-encoding; bh=0o1JPxd5MJ2tlckJ7OGp1y3xO1uSXvFDzNRItMlQsqg=; b=xE9Cyi8hHQzFStrSP1bl/BR/PNDlMPP/8rQCEIq6qIJ1TyyvLm4XziHOsx6bDgNkiV K6JxykUbSdhsENPo7kHmMkuK8iWob/fkj57SCEyu0XsH587O0hYy5kDluFIO6+KKCuhq BPIizDTeRjob3dBPRr5PaF/B4gI5xnLFxHyGPbof4PhmDtLIZHU+er7xakzG8D9FENUp 2IzFD4J0VNeQnt6FRhOEkNkpikqwaMjGC0ea65Vx0EKSr6F9dJbbCntIPZy5IfHu2ZnD A3hy0DaLI5CrbVjpAKQKFFCXOH0SqED07DsaF6163An6zELcKVzonwVdyVa/5yMsiEpZ DD6w== X-Received: by 10.68.201.226 with SMTP id kd2mr5495276pbc.157.1389003877414; Mon, 06 Jan 2014 02:24:37 -0800 (PST) Received: from [10.10.19.201] ([211.103.180.226]) by mx.google.com with ESMTPSA id nl7sm127767994pbc.6.2014.01.06.02.24.34 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 06 Jan 2014 02:24:36 -0800 (PST) Message-ID: <52CA8460.6030206@gmail.com> Date: Mon, 06 Jan 2014 18:24:32 +0800 From: Kinglong Mee User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:24.0) Gecko/20100101 Thunderbird/24.2.0 MIME-Version: 1.0 To: "J. Bruce Fields" , Trond Myklebust , Linux NFS Mailing List Subject: [PATCH] SUNRPC: fix memory leak of peer addresses in XPRT Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org X-Spam-Status: No, score=-7.1 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP If creating xprt failed after xs_format_peer_addresses, sunrpc must free those memory of peer addresses in xprt. Signed-off-by: Kinglong Mee --- net/sunrpc/xprtsock.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/net/sunrpc/xprtsock.c b/net/sunrpc/xprtsock.c index 25dbfa9..11ceba3 100644 --- a/net/sunrpc/xprtsock.c +++ b/net/sunrpc/xprtsock.c @@ -2725,8 +2725,10 @@ static struct rpc_xprt *xs_setup_local(struct xprt_create *args) xprt_set_bound(xprt); xs_format_peer_addresses(xprt, "local", RPCBIND_NETID_LOCAL); ret = ERR_PTR(xs_local_setup_socket(transport)); - if (ret) + if (ret) { + xs_free_peer_addresses(xprt); goto out_err; + } break; default: ret = ERR_PTR(-EAFNOSUPPORT); @@ -2738,6 +2740,8 @@ static struct rpc_xprt *xs_setup_local(struct xprt_create *args) if (try_module_get(THIS_MODULE)) return xprt; + + xs_free_peer_addresses(xprt); ret = ERR_PTR(-EINVAL); out_err: xprt_free(xprt); @@ -2816,6 +2820,8 @@ static struct rpc_xprt *xs_setup_udp(struct xprt_create *args) if (try_module_get(THIS_MODULE)) return xprt; + + xs_free_peer_addresses(xprt); ret = ERR_PTR(-EINVAL); out_err: xprt_free(xprt); @@ -2893,9 +2899,10 @@ static struct rpc_xprt *xs_setup_tcp(struct xprt_create *args) xprt->address_strings[RPC_DISPLAY_ADDR], xprt->address_strings[RPC_DISPLAY_PROTO]); - if (try_module_get(THIS_MODULE)) return xprt; + + xs_free_peer_addresses(xprt); ret = ERR_PTR(-EINVAL); out_err: xprt_free(xprt);