From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from cn.fujitsu.com ([222.73.24.84]:26518 "EHLO song.cn.fujitsu.com" rhost-flags-OK-FAIL-OK-OK) by vger.kernel.org with ESMTP id S1752811Ab3KGByS (ORCPT ); Wed, 6 Nov 2013 20:54:18 -0500 Message-ID: <527AF1F4.2050803@cn.fujitsu.com> Date: Thu, 07 Nov 2013 09:50:44 +0800 From: Wang Shilong MIME-Version: 1.0 To: Eric Sandeen CC: linux-btrfs@vger.kernel.org Subject: Re: [PATCH 08/16] btrfs-progs: fix resource leak in scrub_start() References: <1383779755-18228-1-git-send-email-sandeen@redhat.com> <1383779755-18228-9-git-send-email-sandeen@redhat.com> <527AF15A.5070409@cn.fujitsu.com> In-Reply-To: <527AF15A.5070409@cn.fujitsu.com> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Sender: linux-btrfs-owner@vger.kernel.org List-ID: On 11/07/2013 09:48 AM, Wang Shilong wrote: > Hi Eric, > > On 11/07/2013 07:15 AM, Eric Sandeen wrote: >> In the "nothing to resume" case we return directly and leak >> several bits of memory; goto out to free them properly. >> >> Resolves-Coverity-CID: 1125934 >> Resolves-Coverity-CID: 1125935 >> Resolves-Coverity-CID: 1125936 >> Signed-off-by: Eric Sandeen >> --- >> cmds-scrub.c | 3 ++- >> 1 files changed, 2 insertions(+), 1 deletions(-) >> >> diff --git a/cmds-scrub.c b/cmds-scrub.c >> index 605af45..5f3eade 100644 >> --- a/cmds-scrub.c >> +++ b/cmds-scrub.c >> @@ -1261,7 +1261,8 @@ static int scrub_start(int argc, char **argv, >> int resume) >> if (!do_quiet) >> printf("scrub: nothing to resume for %s, fsid %s\n", >> path, fsid); >> - return 2; >> + err = 2; >> + goto out; > Thanks for tracking this problem, but > i intend to return 2 in such case originally. > return '!err' will revert to return 1 rather than 2. see label out: if (err) return 1 > > Thanks, > Wang >> } >> ret = prg_fd = socket(AF_UNIX, SOCK_STREAM, 0); > > -- > To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html >