From nobody Tue May 7 13:01:52 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1606293186; cv=none; d=zohomail.com; s=zohoarc; b=ZaV1ewQjegAhkSuAk5EAbYkeP5oPj1YiizVPDHUIQRMTMWVovliFg0q/eGDhWJo1wFzmfjbUDEUkaFIWdJgw1CQivfipXlwQTLlubamtjaymZGHGiChSX7JOmfc47z4Oa4vh8iEqu5DkCkBPs7bofvnJQYHqv/fKEUZYVw14gsw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1606293186; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:MIME-Version:Message-ID:Subject:To; bh=RiIczNIcLgju6IjIF+5/q04V+IDAgeIUY6yORTs6u3c=; b=oHXu9CHtOoPhX4vqFbpdhPVFmA8maX/lR/4tSd9KrXYd0Dz1x3AH+CpB0lKFaTixrNFWngYNzk0vQToShuizOncqw47QgvuR+DQsEFwp6JpRYpDHKxF/CpQraMFq1bJbZhV1ESV5KS5sMHifXgxHgtAcZE5PLFd/38qmABLSdXo= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by mx.zohomail.com with SMTPS id 1606293186191882.7576453504261; Wed, 25 Nov 2020 00:33:06 -0800 (PST) Received: from mail-wm1-f72.google.com (mail-wm1-f72.google.com [209.85.128.72]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-279-uqyPwQdcNamf7m7zVx0RXA-1; Wed, 25 Nov 2020 03:33:03 -0500 Received: by mail-wm1-f72.google.com with SMTP id y187so506792wmy.3 for ; Wed, 25 Nov 2020 00:33:03 -0800 (PST) Return-Path: Return-Path: Received: from localhost.localdomain (111.red-88-21-205.staticip.rima-tde.net. [88.21.205.111]) by smtp.gmail.com with ESMTPSA id t11sm3324005wmf.35.2020.11.25.00.33.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 25 Nov 2020 00:33:01 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1606293185; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=RiIczNIcLgju6IjIF+5/q04V+IDAgeIUY6yORTs6u3c=; b=H8p2pcRyWr7S8zapNgSNuXdHKqsMCLGwkpgHw0NlHqFHdiwYFHvhSzGrCrqqzsUsOY+2K1 FPdvzSpbKoq6dvgXXOMA+lQqSAHgpvT9OvpCKd/h9ISaSM3HqZhP0rT3KBVfKo7lJP08CQ nKFNswDX9U4PBXWq7HA54CHH6Um0cv4= X-MC-Unique: uqyPwQdcNamf7m7zVx0RXA-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=RiIczNIcLgju6IjIF+5/q04V+IDAgeIUY6yORTs6u3c=; b=qvzhqhKwhmSmTp/o8qQHOiAmKec5cs3pKf7VrHZEeioZWkn1aCLxBlxHbXCntLoo5Z MRiuugThs0pVumbufQVX9EsfL8zQwrUjyaYaAwmJB1GQRwWkFKJOIUB7vBQEKzzaAeMc a/M9gJcWP8W7CONpGrkjsMB2WzIlQAawV35ik9lpc9GzAjjTTY8dTjQDJ2nyA/M37T/+ mUlSynR1CHRJxECU9f/B0XLn+fhBggu1apU2lYEMUdAY97Pkg02YSHPcIeTnBXaQauZS kX0/wjFjXr3WogtFCQbycnPhqEsOpC9rES33zrkf6BCBs/IiilZa/iRwyum7Ds9qHEvT BNrg== X-Gm-Message-State: AOAM530APm5TYaJbiqXUahWoEGsG3l50sOWRTkuAIBSnUAGgdzMjWt1F SNfRsMZ9rSygVOgtrKW7xmSFp+vP23KXlDPEtHkKNuWP586KFA2nheFlsVb7DD18mvM+DKulV5y d9NShj5HbIHnsnQ== X-Received: by 2002:a1c:7f81:: with SMTP id a123mr2655604wmd.6.1606293182108; Wed, 25 Nov 2020 00:33:02 -0800 (PST) X-Google-Smtp-Source: ABdhPJycQM9gud5zikUHZBnuhQDPW0MpQQ1kKAFpalo+CH5vZMPi9VbC1RGJSNIDYiND996l8DVVkQ== X-Received: by 2002:a1c:7f81:: with SMTP id a123mr2655589wmd.6.1606293181936; Wed, 25 Nov 2020 00:33:01 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Paolo Bonzini , Eduardo Habkost , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Richard Henderson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v3] hw/core/qdev-properties-system: Rewrite set_pci_host_devaddr using GLib Date: Wed, 25 Nov 2020 09:33:00 +0100 Message-Id: <20201125083300.861206-1-philmd@redhat.com> X-Mailer: git-send-email 2.26.2 MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) set_pci_host_devaddr() is hard to follow, thus bug-prone. For example, a bug was introduced in commit bccb20c49df, as the same line might be used to parse a bus (up to 0xff) or a slot (up to 0x1f). Instead of making things worst, rewrite using g_strsplit(). Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- v3: Rebased v2: Free g_strsplit() with g_auto(GStrv) (Daniel) --- hw/core/qdev-properties-system.c | 62 ++++++++++++++------------------ 1 file changed, 27 insertions(+), 35 deletions(-) diff --git a/hw/core/qdev-properties-system.c b/hw/core/qdev-properties-sys= tem.c index 9d80a07d26f..79408e32289 100644 --- a/hw/core/qdev-properties-system.c +++ b/hw/core/qdev-properties-system.c @@ -857,11 +857,11 @@ static void set_pci_host_devaddr(Object *obj, Visitor= *v, const char *name, DeviceState *dev =3D DEVICE(obj); Property *prop =3D opaque; PCIHostDeviceAddress *addr =3D qdev_get_prop_ptr(dev, prop); - char *str, *p; - char *e; + g_autofree char *str =3D NULL; + g_auto(GStrv) col_s0 =3D NULL; + g_auto(GStrv) dot_s =3D NULL; + char **col_s; unsigned long val; - unsigned long dom =3D 0, bus =3D 0; - unsigned int slot =3D 0, func =3D 0; =20 if (dev->realized) { qdev_prop_set_after_realize(dev, name, errp); @@ -872,58 +872,50 @@ static void set_pci_host_devaddr(Object *obj, Visitor= *v, const char *name, return; } =20 - p =3D str; - val =3D strtoul(p, &e, 16); - if (e =3D=3D p || *e !=3D ':') { + col_s =3D col_s0 =3D g_strsplit(str, ":", 3); + if (!col_s || !col_s[0] || !col_s[1]) { goto inval; } - bus =3D val; =20 - p =3D e + 1; - val =3D strtoul(p, &e, 16); - if (e =3D=3D p) { - goto inval; - } - if (*e =3D=3D ':') { - dom =3D bus; - bus =3D val; - p =3D e + 1; - val =3D strtoul(p, &e, 16); - if (e =3D=3D p) { + /* domain */ + if (col_s[2]) { + if (qemu_strtoul(col_s[0], NULL, 16, &val) < 0 || val > 0xffff) { goto inval; } + addr->domain =3D val; + col_s++; + } else { + addr->domain =3D 0; } - slot =3D val; =20 - if (*e !=3D '.') { + /* bus */ + if (qemu_strtoul(col_s[0], NULL, 16, &val) < 0 || val > 0xff) { goto inval; } - p =3D e + 1; - val =3D strtoul(p, &e, 10); - if (e =3D=3D p) { - goto inval; - } - func =3D val; + addr->bus =3D val; =20 - if (dom > 0xffff || bus > 0xff || slot > 0x1f || func > 7) { + /* . */ + dot_s =3D g_strsplit(col_s[1], ".", 2); + if (!dot_s || !dot_s[0] || !dot_s[1]) { goto inval; } =20 - if (*e) { + /* slot */ + if (qemu_strtoul(dot_s[0], NULL, 16, &val) < 0 || val > 0x1f) { goto inval; } + addr->slot =3D val; =20 - addr->domain =3D dom; - addr->bus =3D bus; - addr->slot =3D slot; - addr->function =3D func; + /* func */ + if (qemu_strtoul(dot_s[1], NULL, 10, &val) < 0 || val > 7) { + goto inval; + } + addr->function =3D val; =20 - g_free(str); return; =20 inval: error_set_from_qdev_prop_error(errp, EINVAL, dev, prop, str); - g_free(str); } =20 const PropertyInfo qdev_prop_pci_host_devaddr =3D { --=20 2.26.2