From nobody Mon Nov 17 13:45:33 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1604545925; cv=none; d=zohomail.com; s=zohoarc; b=PEK3ncjPA5O1kofeZcp5hItUnXBtEIsE35+40rXGkTAXuTx2xZs8pDxaMPkQ94Zn3hKyj075Af9lfSUDvVFTgW1+MmcImglmNaYRzq7uqSixLI2qYisfPtVGHaKj/NcnDJTa8a9cx2H0UZ7g8yMGs4n4l40c3DhZXfFtr6bezJY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1604545925; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=WoYMtZFYBMLE9h4xr1cnRUpBg1WGwSLs/1dZWrn6dZM=; b=elYqtMMLlFxoBRiU3atU2L/PZLEOUEN/aYgb+5NtHHNWU8wt8sRbHVUTgoCIWtdJwbEQyJ0NkwPGXkEYXqgc6PwN9yn8gX5lQGrOp/UW+mojjpC1pqOfvjed7AnsrilzBMcLz5UuOhyI+oVfyUzLhG2KvRfj019bV/Ynuz+q4RY= ARC-Authentication-Results: i=1; mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 16045459254580.7895270162699717; Wed, 4 Nov 2020 19:12:05 -0800 (PST) Received: from localhost ([::1]:54642 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kaVgy-0007Yk-5k for importer@patchew.org; Wed, 04 Nov 2020 22:12:04 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:58154) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kaVgL-00072Z-Bn; Wed, 04 Nov 2020 22:11:25 -0500 Received: from smtp.h3c.com ([60.191.123.50]:40662 helo=h3cspam02-ex.h3c.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kaVgG-0004nd-D3; Wed, 04 Nov 2020 22:11:25 -0500 Received: from DAG2EX04-BASE.srv.huawei-3com.com ([10.8.0.67]) by h3cspam02-ex.h3c.com with ESMTPS id 0A53AqCC005662 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=FAIL); Thu, 5 Nov 2020 11:10:52 +0800 (GMT-8) (envelope-from tu.guoyi@h3c.com) Received: from DAG2EX03-BASE.srv.huawei-3com.com (10.8.0.66) by DAG2EX04-BASE.srv.huawei-3com.com (10.8.0.67) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2106.2; Thu, 5 Nov 2020 11:10:54 +0800 Received: from DAG2EX03-BASE.srv.huawei-3com.com ([fe80::5d18:e01c:bbbd:c074]) by DAG2EX03-BASE.srv.huawei-3com.com ([fe80::5d18:e01c:bbbd:c074%7]) with mapi id 15.01.2106.002; Thu, 5 Nov 2020 11:10:54 +0800 From: Tuguoyi To: Kevin Wolf , Max Reitz , "qemu-block@nongnu.org" Subject: [PATCH] block: Return the real error code in bdrv_getlength Thread-Topic: [PATCH] block: Return the real error code in bdrv_getlength Thread-Index: AdazIT2D4zpMc6pIQHiDry0tmEuvDw== Date: Thu, 5 Nov 2020 03:10:53 +0000 Message-ID: Accept-Language: en-US Content-Language: zh-CN X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [10.125.108.131] x-sender-location: DAG2 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-DNSRBL: X-MAIL: h3cspam02-ex.h3c.com 0A53AqCC005662 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=60.191.123.50; envelope-from=tu.guoyi@h3c.com; helo=h3cspam02-ex.h3c.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/11/04 22:11:07 X-ACL-Warn: Detected OS = FreeBSD 9.x or newer [fuzzy] X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: "qemu-devel@nongnu.org" Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" The return code from bdrv_nb_sectors() should be checked before doing the following sanity check. Signed-off-by: Guoyi Tu --- block.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/block.c b/block.c index 430edf7..19ebbc0 100644 --- a/block.c +++ b/block.c @@ -5082,6 +5082,10 @@ int64_t bdrv_getlength(BlockDriverState *bs) { int64_t ret =3D bdrv_nb_sectors(bs); =20 + if (ret < 0) { + return ret; + } + ret =3D ret > INT64_MAX / BDRV_SECTOR_SIZE ? -EFBIG : ret; return ret < 0 ? ret : ret * BDRV_SECTOR_SIZE; } --=20 2.7.4 -- Best regards, Guoyi