From patchwork Tue May 27 15:37:06 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chuck Lever III X-Patchwork-Id: 353014 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from userp1040.oracle.com (userp1040.oracle.com [156.151.31.81]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 45905140098 for ; Wed, 28 May 2014 01:37:15 +1000 (EST) Received: from acsinet22.oracle.com (acsinet22.oracle.com [141.146.126.238]) by userp1040.oracle.com (Sentrion-MTA-4.3.2/Sentrion-MTA-4.3.2) with ESMTP id s4RFbBRx030311 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Tue, 27 May 2014 15:37:12 GMT Received: from oss.oracle.com (oss-external.oracle.com [137.254.96.51]) by acsinet22.oracle.com (8.14.4+Sun/8.14.4) with ESMTP id s4RFbAEr004690 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Tue, 27 May 2014 15:37:10 GMT Received: from localhost ([127.0.0.1] helo=oss.oracle.com) by oss.oracle.com with esmtp (Exim 4.63) (envelope-from ) id 1WpJR8-0004dc-J1; Tue, 27 May 2014 08:37:10 -0700 Received: from acsinet21.oracle.com ([141.146.126.237]) by oss.oracle.com with esmtp (Exim 4.63) (envelope-from ) id 1WpJR6-0004dT-RP for fedfs-utils-devel@oss.oracle.com; Tue, 27 May 2014 08:37:08 -0700 Received: from aserp1020.oracle.com (aserp1020.oracle.com [141.146.126.67]) by acsinet21.oracle.com (8.14.4+Sun/8.14.4) with ESMTP id s4RFb8tK028174 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Tue, 27 May 2014 15:37:08 GMT Received: from mail-ie0-f172.google.com (mail-ie0-f172.google.com [209.85.223.172]) by aserp1020.oracle.com (Sentrion-MTA-4.3.2/Sentrion-MTA-4.3.2) with ESMTP id s4RFb72d025726 (version=TLSv1/SSLv3 cipher=RC4-SHA bits=128 verify=OK) for ; Tue, 27 May 2014 15:37:08 GMT Authentication-Results: aserp1020.oracle.com; dkim=pass reason="2048-bit key" header.d=gmail.com header.i=@gmail.com header.b=NP0KtlfD Received: by mail-ie0-f172.google.com with SMTP id tp5so9068686ieb.3 for ; Tue, 27 May 2014 08:37:07 -0700 (PDT) X-Received: by 10.50.47.12 with SMTP id z12mr34616917igm.37.1401205027484; Tue, 27 May 2014 08:37:07 -0700 (PDT) Received: from seurat.1015granger.net ([2604:8800:100:81fc:20c:29ff:fe44:ec31]) by mx.google.com with ESMTPSA id v9sm8466934igd.14.2014.05.27.08.37.06 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 27 May 2014 08:37:07 -0700 (PDT) To: fedfs-utils-devel@oss.oracle.com From: Chuck Lever Date: Tue, 27 May 2014 11:37:06 -0400 Message-ID: <20140527153706.1177.31412.stgit@seurat.1015granger.net> In-Reply-To: <20140527153133.1177.54989.stgit@seurat.1015granger.net> References: <20140527153133.1177.54989.stgit@seurat.1015granger.net> User-Agent: StGit/0.16 MIME-Version: 1.0 X-Flow-Control-Info: class=Pass-to-MM reputation=ipRisk-All ip=209.85.223.172 ct-class=R4 ct-vol1=-94 ct-vol2=8 ct-vol3=7 ct-risk=34 ct-spam1=47 ct-spam2=7 ct-bulk=6 rcpts=1 size=711 X-Sendmail-CM-Score: 0.00% X-Sendmail-CM-Analysis: v=2.1 cv=E4H0+8tl c=1 sm=1 tr=0 a=RPZgViSN43jj7cy/UnIhow==:117 a=dzsqy3y4QnMA:10 a=yKFzD-pcSSkA:10 a=dPGociXpb70A:10 a=IkcTkHD0fZMA:10 a=xqWC_Br6kY4A:10 a=yPCof4ZbAAAA:8 a=Lb1rMZzfAAAA:8 a=1XWaLZrsAAAA:8 a=LyRhMQ_NyS6s5zSyctsA:9 a=QEXdDO 2ut3YA:10 a=7DSvI1NPTFQA:10 X-Sendmail-CT-RefID: str=0001.0A010205.5384B124.014D, ss=1, re=0.000, recu=0.000, reip=0.000, cl=1, cld=1, fgs=0 X-Sendmail-CT-Classification: not spam Subject: [fedfs-utils] [PATCH 05/17] nfsref: Fix memory leak in nfsref_add_build_fsl() X-BeenThere: fedfs-utils-devel@oss.oracle.com X-Mailman-Version: 2.1.9 Precedence: list Reply-To: fedfs-utils Developers List-Id: fedfs-utils Developers List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: fedfs-utils-devel-bounces@oss.oracle.com Errors-To: fedfs-utils-devel-bounces@oss.oracle.com X-Source-IP: acsinet22.oracle.com [141.146.126.238] Fixes: 538e6282ff68e838763bc30aeeae41c5ec309ca9 Signed-off-by: Chuck Lever --- src/nfsref/add.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/nfsref/add.c b/src/nfsref/add.c index 8e925cc057e0..848d1d4f0f95 100644 --- a/src/nfsref/add.c +++ b/src/nfsref/add.c @@ -376,8 +376,10 @@ nfsref_add_build_fsl(const char *fsn_uuid, const char *server, strncpy(new->fl_fsnuuid, fsn_uuid, sizeof(new->fl_fsnuuid)); retval = nfsref_add_nfs_fsl_defaults(server, rootpath, &new->fl_u.fl_nfsfsl); - if (retval != FEDFS_OK) + if (retval != FEDFS_OK) { + nsdb_free_fedfs_fsl(new); return retval; + } *fsl = new; return FEDFS_OK;