From patchwork Thu Jun 26 02:53:04 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gui Hecheng X-Patchwork-Id: 4425531 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 B9B129F2C8 for ; Thu, 26 Jun 2014 02:58:39 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id EE5F420379 for ; Thu, 26 Jun 2014 02:58:38 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id EFB5320381 for ; Thu, 26 Jun 2014 02:58:37 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757370AbaFZC6f (ORCPT ); Wed, 25 Jun 2014 22:58:35 -0400 Received: from cn.fujitsu.com ([59.151.112.132]:26696 "EHLO heian.cn.fujitsu.com" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S1753169AbaFZC6d (ORCPT ); Wed, 25 Jun 2014 22:58:33 -0400 X-IronPort-AV: E=Sophos;i="5.00,779,1396972800"; d="scan'208";a="32451597" Received: from unknown (HELO edo.cn.fujitsu.com) ([10.167.33.5]) by heian.cn.fujitsu.com with ESMTP; 26 Jun 2014 10:55:51 +0800 Received: from G08CNEXCHPEKD01.g08.fujitsu.local (localhost.localdomain [127.0.0.1]) by edo.cn.fujitsu.com (8.14.3/8.13.1) with ESMTP id s5Q2wUHr027096 for ; Thu, 26 Jun 2014 10:58:30 +0800 Received: from localhost.localdomain (10.167.226.111) by G08CNEXCHPEKD01.g08.fujitsu.local (10.167.33.89) with Microsoft SMTP Server (TLS) id 14.3.181.6; Thu, 26 Jun 2014 10:58:40 +0800 From: Gui Hecheng To: CC: Gui Hecheng Subject: [PATCH 4/6] btrfs-progs: cleanup possible silent failure in btrfs-image Date: Thu, 26 Jun 2014 10:53:04 +0800 Message-ID: <1403751186-31559-4-git-send-email-guihc.fnst@cn.fujitsu.com> X-Mailer: git-send-email 1.8.1.4 In-Reply-To: <1403751186-31559-1-git-send-email-guihc.fnst@cn.fujitsu.com> References: <1403751186-31559-1-git-send-email-guihc.fnst@cn.fujitsu.com> MIME-Version: 1.0 X-Originating-IP: [10.167.226.111] 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, T_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 If the malloc above fails, the btrfs-image will exit directly without any error messages. Now just return the ENOMEM errno and let the caller prompt the error message. Signed-off-by: Gui Hecheng --- btrfs-image.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/btrfs-image.c b/btrfs-image.c index 2d482c3..e0aabfd 100644 --- a/btrfs-image.c +++ b/btrfs-image.c @@ -2421,7 +2421,8 @@ static int update_disk_super_on_device(struct btrfs_fs_info *info, buf = malloc(BTRFS_SUPER_INFO_SIZE); if (!buf) { ret = -ENOMEM; - exit(1); + close(fp); + return ret; } memcpy(buf, info->super_copy, BTRFS_SUPER_INFO_SIZE);