From nobody Fri May 10 21:05:52 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) client-ip=63.128.21.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 63.128.21.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=1602584578; cv=none; d=zohomail.com; s=zohoarc; b=LCom5+1yEle+T1tRZV8cRSpVORONHy6z+OS+LR80tzB+ZMqi9oRuOPUGmqm1vhiRj5ZZz9sG9tp0JczeW/Iy8X/3CC+15G6NgdVnkpym/pr7I9mgZWNksECec9c2vvbFf6JNNk4PhbslJ6VT3h9AisKKBmHcwqdOWh0dxpDHKPE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1602584578; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:MIME-Version:Message-ID:Subject:To; bh=I2xLcUCOg+w2ZAQrbFZfCxIVaFLFEbcnv9+M6NmjtDk=; b=Lmwbbdjqjs/RjZF/fG9d7sArwJKtFhOQLQ7Bk427fvdBdN4YSgxQaokR32nGyv2Pqwj+t1lpuRDOqLPauuqpkgAUkeptdEihWDk6ETRr6z1GzyXAUhyqjkmhuh3QI95UZgzUUnfvWWILgvd2nXtnb8ghA5ZI/5riIo28gaS1awY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.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 [63.128.21.124]) by mx.zohomail.com with SMTPS id 1602584578452245.89449904000912; Tue, 13 Oct 2020 03:22:58 -0700 (PDT) Received: from mail-wr1-f72.google.com (mail-wr1-f72.google.com [209.85.221.72]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-354-bfBj4RC2N8KloGN7l3PJYg-1; Tue, 13 Oct 2020 06:22:55 -0400 Received: by mail-wr1-f72.google.com with SMTP id 33so10575497wrf.22 for ; Tue, 13 Oct 2020 03:22:55 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.redhat.com (106.red-83-59-162.dynamicip.rima-tde.net. [83.59.162.106]) by smtp.gmail.com with ESMTPSA id u195sm4367399wmu.18.2020.10.13.03.22.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 13 Oct 2020 03:22:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1602584577; 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=I2xLcUCOg+w2ZAQrbFZfCxIVaFLFEbcnv9+M6NmjtDk=; b=Pw7NsqBvquAIi7+qRaCTBkpZ1ExLp1goRu1+6JFAA/wF+aKY+nIrvSRy+B3MGIzpGtcGlu c99y+Mm9KJdHf2f7/NhHYHoU3+9STnWjjLRRekstyNUOyqOYezVv4s7ciNq/VapsAmSRlG DLXXuoxhgDwipXw9jJFIvaMy0WG0eUA= X-MC-Unique: bfBj4RC2N8KloGN7l3PJYg-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=I2xLcUCOg+w2ZAQrbFZfCxIVaFLFEbcnv9+M6NmjtDk=; b=Cp0O4WD8Frvq+zv7NCSgvwB9SlnKjUJyeY/abzqi5/g/xxFMNMRbsd2j2ZfAIQE767 ljMzV+/cQSehb/HdyBm2b1FgbfSIMVFdCL6i1QWZ2sMnS60/ki4bkfr+s7lP6AhQgSux TSzRJlXqmMkPK2YG1xSKs0kl9gvkGlQA88CuyAecorlTE4OCjPs56hJlqNVCvLjPTXSJ HrgGFdphoeDj0PtW3tL4wwkIK0ct8tcpzlKs9kyEETyagmbbmYgIWTmELjIM6vYmRyzZ l6dAqAWox1Ih8UHG1rhgDdlADP/aDeUBPe0c4mmgurQSIoLEhYxHZdwafsl2BqYdzc4b 4pJQ== X-Gm-Message-State: AOAM531TKoiDEQDgDA+jwEQK7NhRvMuJ/sM7ZvpvHtVJe28PmUgMyyp3 uaH1va8QhPhgJjR1lOvZJwxZhiFIuIQfie+zgwoJqaJdqkXu87T2pcsl0SzNzgFZ7BX/hWVxvMN 60UmCLndIicgsiw== X-Received: by 2002:adf:ff88:: with SMTP id j8mr33823725wrr.69.1602584574566; Tue, 13 Oct 2020 03:22:54 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwdhnZRV6Rqa5x2UJW9trFmtSmPBOMpbDO9EjlqOAZfmwJ3Vx2FBQPxXdGkSGGp0y8+8/OysQ== X-Received: by 2002:adf:ff88:: with SMTP id j8mr33823709wrr.69.1602584574355; Tue, 13 Oct 2020 03:22:54 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Richard Henderson , Paolo Bonzini , Eduardo Habkost , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Klaus Herman Subject: [PATCH v2] hw/core/qdev-properties-system: Rewrite set_pci_host_devaddr using GLib Date: Tue, 13 Oct 2020 12:22:52 +0200 Message-Id: <20201013102252.3562860-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. We indeed introduced a bug 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(). Fixes: bccb20c49df ("Use qemu_strtoul() in set_pci_host_devaddr()") Reported-by: Klaus Herman Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- v2: Free g_strsplit() with g_auto(GStrv) (Daniel) --- hw/core/qdev-properties-system.c | 61 ++++++++++++++------------------ 1 file changed, 27 insertions(+), 34 deletions(-) diff --git a/hw/core/qdev-properties-system.c b/hw/core/qdev-properties-sys= tem.c index 49bdd125814..36d4fd8b22a 100644 --- a/hw/core/qdev-properties-system.c +++ b/hw/core/qdev-properties-system.c @@ -878,11 +878,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; - const 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); @@ -893,57 +893,50 @@ static void set_pci_host_devaddr(Object *obj, Visitor= *v, const char *name, return; } =20 - p =3D str; - if (qemu_strtoul(p, &e, 16, &val) < 0 || val > 0xffff || e =3D=3D p) { + col_s =3D col_s0 =3D g_strsplit(str, ":", 3); + if (!col_s || !col_s[0] || !col_s[1]) { goto inval; } - if (*e !=3D ':') { - goto inval; - } - bus =3D val; =20 - p =3D (char *)e + 1; - if (qemu_strtoul(p, &e, 16, &val) < 0 || val > 0x1f || e =3D=3D p) { - goto inval; - } - if (*e =3D=3D ':') { - dom =3D bus; - bus =3D val; - p =3D (char *)e + 1; - if (qemu_strtoul(p, &e, 16, &val) < 0 || val > 0x1f || 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 (char *)e + 1; - if (qemu_strtoul(p, &e, 10, &val) < 0 || val > 7 || e =3D=3D p) { - goto inval; - } - func =3D val; + addr->bus =3D val; =20 - if (bus > 0xff) { + /* . */ + 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