From patchwork Wed Nov 6 23:15:47 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Sandeen X-Patchwork-Id: 3149771 Return-Path: X-Original-To: patchwork-linux-btrfs@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 472609F3C4 for ; Wed, 6 Nov 2013 23:17:15 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 6736620304 for ; Wed, 6 Nov 2013 23:17:14 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id AD4C2202FF for ; Wed, 6 Nov 2013 23:17:13 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752439Ab3KFXQ7 (ORCPT ); Wed, 6 Nov 2013 18:16:59 -0500 Received: from sandeen.net ([63.231.237.45]:56124 "EHLO sandeen.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751691Ab3KFXP6 (ORCPT ); Wed, 6 Nov 2013 18:15:58 -0500 Received: by sandeen.net (Postfix, from userid 500) id 708DD654E646; Wed, 6 Nov 2013 17:15:57 -0600 (CST) From: Eric Sandeen To: linux-btrfs@vger.kernel.org Subject: [PATCH 08/16] btrfs-progs: fix resource leak in scrub_start() Date: Wed, 6 Nov 2013 17:15:47 -0600 Message-Id: <1383779755-18228-9-git-send-email-sandeen@redhat.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1383779755-18228-1-git-send-email-sandeen@redhat.com> References: <1383779755-18228-1-git-send-email-sandeen@redhat.com> Sender: linux-btrfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, 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 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; } ret = prg_fd = socket(AF_UNIX, SOCK_STREAM, 0);