From nobody Tue May 7 21:22:07 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1606231118; cv=none; d=zohomail.com; s=zohoarc; b=k5i3UxTfoH+KNBe3TVDDbkw0pmcOGuS+NKds7a2d5uky/EN2dUUuo2aRiQb/wRrE4erv8XAcURIACvZMp4CgrS1DkwLXM76/VeYmJ2MoarNoBXY4Ew7URR1OT9y5R5t3/fsyo8QEb3x8movBfLPeSnXnUjgLpnktVOn9NHd/aik= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1606231118; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=vc2m7Zdk8qGid4lqjbFawrRjd/TI7irAIqqGunEdnlQ=; b=id4r7fnROv4wtUPNttGJNsxSBwttbxJh9Z43J4IfbOUthZv9ZmJyYHc/Vi/W9M7NMR3EfD6muClnK5XWlYFYNMbXhYhj6ZGy6ENb54y2jMSmr+eQXIAjjA81TRlz6oEcoeeZZpOOyvXba9Xo2QStv0PHaV/qvpFOHLkiIdYPMf8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1606231118733322.5937782578093; Tue, 24 Nov 2020 07:18:38 -0800 (PST) Received: from localhost ([::1]:45364 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kha5V-0002IT-OV for importer@patchew.org; Tue, 24 Nov 2020 10:18:37 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:56650) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kha2C-0000QH-Nx for qemu-devel@nongnu.org; Tue, 24 Nov 2020 10:15:12 -0500 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:30072) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kha2A-0005hW-Pm for qemu-devel@nongnu.org; Tue, 24 Nov 2020 10:15:12 -0500 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-355-rQcCCBEsM8uN8fXj4bMSug-1; Tue, 24 Nov 2020 10:15:08 -0500 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id CCCE4809DC3; Tue, 24 Nov 2020 15:15:06 +0000 (UTC) Received: from localhost (unknown [10.10.67.22]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0914119C44; Tue, 24 Nov 2020 15:15:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1606230910; 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: in-reply-to:in-reply-to:references:references; bh=vc2m7Zdk8qGid4lqjbFawrRjd/TI7irAIqqGunEdnlQ=; b=bpkc4vaUaglH97Qw5nZQVg68NOGk5rbha77dSBs6cJgm9Vj6bHxfAVSn3qqVoLw11elIF7 7CG/owySJLuUE4m8cqH2PEUsLPr/A0faWKP877IFVvV5U6JqJAvkFT6h3UpFTz2YsfmJwj h6tT+KBWLMD3INfJjiwRtjEipB1IN9g= X-MC-Unique: rQcCCBEsM8uN8fXj4bMSug-1 From: Eduardo Habkost To: qemu-devel@nongnu.org Subject: [PULL 1/1] Revert "hw/core/qdev-properties: Use qemu_strtoul() in set_pci_host_devaddr()" Date: Tue, 24 Nov 2020 10:15:00 -0500 Message-Id: <20201124151500.2945356-2-ehabkost@redhat.com> In-Reply-To: <20201124151500.2945356-1-ehabkost@redhat.com> References: <20201124151500.2945356-1-ehabkost@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=ehabkost@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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=216.205.24.124; envelope-from=ehabkost@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, 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: Geoffrey McRae , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Eduardo Habkost , "Michael S. Tsirkin" , Klaus Herman , Paolo Bonzini , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) From: "Michael S. Tsirkin" This reverts commit bccb20c49df1bd683248a366021973901c11982f as it introduced a regression blocking bus addresses > 0x1f or higher. Legal bus numbers go up to 0xff. Fixes: bccb20c49df ("Use qemu_strtoul() in set_pci_host_devaddr()") Reported-by: Klaus Herman Reported-by: Geoffrey McRae Signed-off-by: Michael S. Tsirkin Reviewed-by: Philippe Mathieu-Daud=C3=A9 Cc: "Philippe Mathieu-Daud=C3=A9" Message-Id: <20201120130409.956956-1-mst@redhat.com> Signed-off-by: Eduardo Habkost --- hw/core/qdev-properties-system.c | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/hw/core/qdev-properties-system.c b/hw/core/qdev-properties-sys= tem.c index b81a4e8d14..9d80a07d26 100644 --- a/hw/core/qdev-properties-system.c +++ b/hw/core/qdev-properties-system.c @@ -858,7 +858,7 @@ static void set_pci_host_devaddr(Object *obj, Visitor *= v, const char *name, Property *prop =3D opaque; PCIHostDeviceAddress *addr =3D qdev_get_prop_ptr(dev, prop); char *str, *p; - const char *e; + char *e; unsigned long val; unsigned long dom =3D 0, bus =3D 0; unsigned int slot =3D 0, func =3D 0; @@ -873,23 +873,23 @@ static void set_pci_host_devaddr(Object *obj, Visitor= *v, const char *name, } =20 p =3D str; - if (qemu_strtoul(p, &e, 16, &val) < 0 || val > 0xffff || e =3D=3D p) { - goto inval; - } - if (*e !=3D ':') { + val =3D strtoul(p, &e, 16); + if (e =3D=3D p || *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) { + 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 (char *)e + 1; - if (qemu_strtoul(p, &e, 16, &val) < 0 || val > 0x1f || e =3D=3D p)= { + p =3D e + 1; + val =3D strtoul(p, &e, 16); + if (e =3D=3D p) { goto inval; } } @@ -898,13 +898,14 @@ static void set_pci_host_devaddr(Object *obj, Visitor= *v, const char *name, if (*e !=3D '.') { goto inval; } - p =3D (char *)e + 1; - if (qemu_strtoul(p, &e, 10, &val) < 0 || val > 7 || e =3D=3D p) { + p =3D e + 1; + val =3D strtoul(p, &e, 10); + if (e =3D=3D p) { goto inval; } func =3D val; =20 - if (bus > 0xff) { + if (dom > 0xffff || bus > 0xff || slot > 0x1f || func > 7) { goto inval; } =20 --=20 2.28.0