From nobody Mon Feb 9 12:25:57 2026 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=1601484612; cv=none; d=zohomail.com; s=zohoarc; b=If39HEnsklnmT7l/XulshMDDFQhN0mWioUXvAKB/WAi/J653gYAsEcJw4hDp/FSz1OHAyVfT0b77V6d3Nt8qXkMcsV87DbXUiuKFlbWlJGYsRsYVkkQCPWypVvpIOS6Zhipr8/zpVs5AXAKs19AlLpFwDFAwahtAbrREGONlEaU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1601484612; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=AEjJONFrTBimyHKi2i/2D3r46cwVifpdF+Aae2zJhkU=; b=Te7kWwCfogIjA1cbw00Bg8fdnylL9HlMge/VMoJ3cXaPeZfEOZ7Pqqf01RsTrPtckSuHleTZ9GFnjJ3Wo1WUnjthHf3DF9OIT26qYjPzfceARUcSMO5Ptt1XCaCRsN0dhVgY4bTBAhhirBpDtMG0uISC3l6mJwINbGSz80A9by4= 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 1601484612674766.1544038397938; Wed, 30 Sep 2020 09:50:12 -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-511-L1AcqBakMFWAPIC1ROxE1A-1; Wed, 30 Sep 2020 12:50:09 -0400 Received: by mail-wr1-f72.google.com with SMTP id d9so823589wrv.16 for ; Wed, 30 Sep 2020 09:50:08 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.redhat.com (74.red-83-53-161.dynamicip.rima-tde.net. [83.53.161.74]) by smtp.gmail.com with ESMTPSA id b188sm3867646wmb.2.2020.09.30.09.50.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 30 Sep 2020 09:50:06 -0700 (PDT) Dkim-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1601484611; 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=AEjJONFrTBimyHKi2i/2D3r46cwVifpdF+Aae2zJhkU=; b=OCfmoYcFtj9+sxPD6HissYFVUHWL06t/Mi23jMm3Y64oxsFls0xoMLSxTYbBOOHE5MzpKc X0dFWDLZSgAEZMflCm7jN3lVGMwtDeeU3LuryYBqLZSy1WtkeQpMGMu3Al9DudaQBZ7wc6 FAviSkt5qAJwuNtzkTobA+vvu3/avzw= X-MC-Unique: L1AcqBakMFWAPIC1ROxE1A-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:in-reply-to :references:mime-version:content-transfer-encoding; bh=AEjJONFrTBimyHKi2i/2D3r46cwVifpdF+Aae2zJhkU=; b=ceyThlFPZY23NiWOdRX3VIv7iHJqUXBfFdmvkntIqkwkRTYp4iVkNnl8X0CQlK6pfK pvhjn8+RE/YPACDu9l3xIUVctXrDBwHPWK7PJ46v5LBMz3SHU/2vgeCGWz7tdKpE+CDW uaKi4tSQoJqyLeSc2otznu0Kgx+O/NkTAcPAYUSqBpH9lnKmXnZosQA+sbfw2kOT9oWI I1oUW3g0T7oPyCnv2KDmFhUKwrJIR4FAy8ha6R5m6+6Et9VBmkoczjvz/lbJl5cQRQWo UIM1Q8mZsvaC2tpsTzQVVTcFycGIEtpEyyxgNOwNQQwQL5x4pTcTNSsH/gNXMovymdN6 1bCQ== X-Gm-Message-State: AOAM530klzAzsvS4jEDn9/piGZnxJ8IOqHwkgLqM55rtKv3NCM8d/Kkr BuMB0Bw+N9XvQ9zyzqOfhpaIll1YRYC2Nk4HGCTq54jVeb1xi9OCnFhkUzYlLKNnVckkZUxn/hU XLqfl59MT7oSfcQ== X-Received: by 2002:a1c:6a08:: with SMTP id f8mr4121739wmc.151.1601484607737; Wed, 30 Sep 2020 09:50:07 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwynqRkbqXGunLbcXXsuq4/kf0mah5iSCwc05KRFVcDGC/tNwtcfpL+8lz9Cc3EmsmQpYveTQ== X-Received: by 2002:a1c:6a08:: with SMTP id f8mr4121721wmc.151.1601484607506; Wed, 30 Sep 2020 09:50:07 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org, Laurent Vivier Cc: Ronnie Sahlberg , Eric Blake , Kevin Wolf , Marcel Apfelbaum , Richard Henderson , Michael Roth , Eduardo Habkost , Peter Lieven , Markus Armbruster , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , qemu-block@nongnu.org, Paolo Bonzini , Max Reitz , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Richard Henderson Subject: [PATCH v3 03/11] hw/core/qdev-properties: Use qemu_strtoul() in set_pci_host_devaddr() Date: Wed, 30 Sep 2020 18:49:41 +0200 Message-Id: <20200930164949.1425294-4-philmd@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200930164949.1425294-1-philmd@redhat.com> References: <20200930164949.1425294-1-philmd@redhat.com> 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) Replace strtoul() by qemu_strtoul() so checkpatch.pl won't complain if we move this code later. Reviewed-by: Richard Henderson Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/core/qdev-properties.c | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/hw/core/qdev-properties.c b/hw/core/qdev-properties.c index 080ba319a1..a1190a5db9 100644 --- a/hw/core/qdev-properties.c +++ b/hw/core/qdev-properties.c @@ -951,7 +951,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; - char *e; + const char *e; unsigned long val; unsigned long dom =3D 0, bus =3D 0; unsigned int slot =3D 0, func =3D 0; @@ -966,23 +966,23 @@ static void set_pci_host_devaddr(Object *obj, Visitor= *v, const char *name, } =20 p =3D str; - val =3D strtoul(p, &e, 16); - if (e =3D=3D p || *e !=3D ':') { + if (qemu_strtoul(p, &e, 16, &val) < 0 || val > 0xffff || e =3D=3D p) { + goto inval; + } + if (*e !=3D ':') { goto inval; } bus =3D val; =20 - p =3D e + 1; - val =3D strtoul(p, &e, 16); - if (e =3D=3D p) { + 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 e + 1; - val =3D strtoul(p, &e, 16); - if (e =3D=3D p) { + p =3D (char *)e + 1; + if (qemu_strtoul(p, &e, 16, &val) < 0 || val > 0x1f || e =3D=3D p)= { goto inval; } } @@ -991,14 +991,13 @@ static void set_pci_host_devaddr(Object *obj, Visitor= *v, const char *name, if (*e !=3D '.') { goto inval; } - p =3D e + 1; - val =3D strtoul(p, &e, 10); - if (e =3D=3D p) { + p =3D (char *)e + 1; + if (qemu_strtoul(p, &e, 10, &val) < 0 || val > 7 || e =3D=3D p) { goto inval; } func =3D val; =20 - if (dom > 0xffff || bus > 0xff || slot > 0x1f || func > 7) { + if (bus > 0xff) { goto inval; } =20 --=20 2.26.2