From nobody Sun Nov 9 17:52:09 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.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; Authentication-Results: mx.zohomail.com; spf=pass (zoho.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 1551375492120890.2425906816536; Thu, 28 Feb 2019 09:38:12 -0800 (PST) Received: from localhost ([127.0.0.1]:43719 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gzPdJ-0007pe-1s for importer@patchew.org; Thu, 28 Feb 2019 12:38:09 -0500 Received: from eggs.gnu.org ([209.51.188.92]:36187) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gzPaV-000684-ML for qemu-devel@nongnu.org; Thu, 28 Feb 2019 12:35:17 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gzPaU-0003e6-SH for qemu-devel@nongnu.org; Thu, 28 Feb 2019 12:35:15 -0500 Received: from smtp03.citrix.com ([162.221.156.55]:52030) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gzPaU-0003Mt-Im for qemu-devel@nongnu.org; Thu, 28 Feb 2019 12:35:14 -0500 X-IronPort-AV: E=Sophos;i="5.58,423,1544486400"; d="scan'208";a="79361363" From: Anthony PERARD To: Date: Thu, 28 Feb 2019 17:34:38 +0000 Message-ID: <20190228173439.8013-4-anthony.perard@citrix.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190228173439.8013-1-anthony.perard@citrix.com> References: <20190228173439.8013-1-anthony.perard@citrix.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 162.221.156.55 Subject: [Qemu-devel] [PULL 3/4] xen-block: report error condition from vbd_name_to_disk() X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: xen-devel@lists.xenproject.org, Peter Maydell Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" From: Paul Durrant The function needs to make sure it is passed a valid disk name. This is easily done by making sure that the parsing loop results in a non-zero value. Spotted by Coverity: CID 1398640 Reported-by: Peter Maydell Signed-off-by: Paul Durrant Acked-by: Anthony PERARD Message-Id: <20190215162533.19475-4-paul.durrant@citrix.com> Signed-off-by: Anthony PERARD --- hw/block/xen-block.c | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/hw/block/xen-block.c b/hw/block/xen-block.c index 29afe2703a..37a456c207 100644 --- a/hw/block/xen-block.c +++ b/hw/block/xen-block.c @@ -351,21 +351,28 @@ static void xen_block_get_vdev(Object *obj, Visitor *= v, const char *name, g_free(str); } =20 -static unsigned int vbd_name_to_disk(const char *name, const char **endp) +static int vbd_name_to_disk(const char *name, const char **endp, + unsigned long *disk) { - unsigned int disk =3D 0; + unsigned int n =3D 0; =20 while (*name !=3D '\0') { if (!g_ascii_isalpha(*name) || !g_ascii_islower(*name)) { break; } =20 - disk *=3D 26; - disk +=3D *name++ - 'a' + 1; + n *=3D 26; + n +=3D *name++ - 'a' + 1; } *endp =3D name; =20 - return disk - 1; + if (!n) { + return -1; + } + + *disk =3D n - 1; + + return 0; } =20 static void xen_block_set_vdev(Object *obj, Visitor *v, const char *name, @@ -418,7 +425,9 @@ static void xen_block_set_vdev(Object *obj, Visitor *v,= const char *name, } } } else { - vdev->disk =3D vbd_name_to_disk(p, &end); + if (vbd_name_to_disk(p, &end, &vdev->disk)) { + goto invalid; + } } =20 if (*end !=3D '\0') { --=20 Anthony PERARD