From patchwork Thu Feb 20 02:49: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: 3684051 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 971DC9F1EE for ; Thu, 20 Feb 2014 02:52:50 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id CDADE20204 for ; Thu, 20 Feb 2014 02:52:49 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 00EF1201D5 for ; Thu, 20 Feb 2014 02:52:49 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752785AbaBTCwq (ORCPT ); Wed, 19 Feb 2014 21:52:46 -0500 Received: from cn.fujitsu.com ([222.73.24.84]:8995 "EHLO song.cn.fujitsu.com" rhost-flags-OK-FAIL-OK-OK) by vger.kernel.org with ESMTP id S1752456AbaBTCwo (ORCPT ); Wed, 19 Feb 2014 21:52:44 -0500 X-IronPort-AV: E=Sophos;i="4.97,509,1389715200"; d="scan'208";a="9564382" Received: from unknown (HELO tang.cn.fujitsu.com) ([10.167.250.3]) by song.cn.fujitsu.com with ESMTP; 20 Feb 2014 10:48:53 +0800 Received: from fnstmail02.fnst.cn.fujitsu.com (tang.cn.fujitsu.com [127.0.0.1]) by tang.cn.fujitsu.com (8.14.3/8.13.1) with ESMTP id s1K2qdxc013316 for ; Thu, 20 Feb 2014 10:52:42 +0800 Received: from localhost.localdomain ([10.167.226.111]) by fnstmail02.fnst.cn.fujitsu.com (Lotus Domino Release 8.5.3) with ESMTP id 2014022010502863-61334 ; Thu, 20 Feb 2014 10:50:28 +0800 From: Gui Hecheng To: linux-btrfs@vger.kernel.org Cc: Gui Hecheng Subject: [PATCH 2/4] btrfs-progs: fix segment fault when exec btrfs-debug-tree as non-root Date: Thu, 20 Feb 2014 10:49:04 +0800 Message-Id: <1392864546-545-2-git-send-email-guihc.fnst@cn.fujitsu.com> X-Mailer: git-send-email 1.8.1.4 In-Reply-To: <1392864546-545-1-git-send-email-guihc.fnst@cn.fujitsu.com> References: <1392864546-545-1-git-send-email-guihc.fnst@cn.fujitsu.com> X-MIMETrack: Itemize by SMTP Server on mailserver/fnst(Release 8.5.3|September 15, 2011) at 2014/02/20 10:50:28, Serialize by Router on mailserver/fnst(Release 8.5.3|September 15, 2011) at 2014/02/20 10:50:32, Serialize complete at 2014/02/20 10:50:32 Sender: linux-btrfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org X-Spam-Status: No, score=-7.5 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable 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 When exec btrfs-debug-tree as non-root user, we get a segment fault. Because the btrfs_scan_block_devices return a success 0 when we fail to open a device. Now we just return the errno if this case happens. Signed-off-by: Gui Hecheng --- utils.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/utils.c b/utils.c index 97e23d5..1878abc 100644 --- a/utils.c +++ b/utils.c @@ -1517,7 +1517,8 @@ scan_again: scans++; goto scan_again; } - return 0; + + return errno ? -errno : 0; } u64 parse_size(char *s)