From nobody Fri Dec 19 17:51:38 2025 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=1593017707; cv=none; d=zohomail.com; s=zohoarc; b=jZUl62FFRqQYU36LRxbyqcrMR/OrTPXDUqLdIUU/4Ol2O5YIXqfvmDctbgCTHUhITBGcbl7U8GEBcHAYcT4gUruNCEP86LbqghZCkrnq4TLgbUBq/bgy2u5nDd11teeO4YZresthgnwh7Xy1r5yYMECQLCmEZsCA9ePf1k3pNo8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1593017707; 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=llJpMUzvWW20uociDU4J65diVE7S1pkbg91SWigNGH0=; b=mYUhExhrOyT0hEhTkAA4L6KjItAbaldS4Gv9oJxkG2XHOxyxG+wFifAi9tSR2z1RgsUW8XcrrBTQGR379IzgUvycu10Gdvw+ZZmL/v4JFBoVpETDAKVyXNlwVMb6XjwMvaxcKlDkxrsJAkYbv4EoOZmOrbufVmjqzHJPlaBXDYw= 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 1593017707705464.10431893704936; Wed, 24 Jun 2020 09:55:07 -0700 (PDT) Received: from localhost ([::1]:54226 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jo8fy-0005KV-DN for importer@patchew.org; Wed, 24 Jun 2020 12:55:06 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51670) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jo8VN-0003WK-Lp for qemu-devel@nongnu.org; Wed, 24 Jun 2020 12:44:09 -0400 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:52490 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1jo8VB-00056O-7J for qemu-devel@nongnu.org; Wed, 24 Jun 2020 12:44:09 -0400 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-31-23J10o4jPI2Q5aoCPfY7qg-1; Wed, 24 Jun 2020 12:43:53 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 080B318585A6; Wed, 24 Jun 2020 16:43:52 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-112-121.ams2.redhat.com [10.36.112.121]) by smtp.corp.redhat.com (Postfix) with ESMTPS id A3D597A01A; Wed, 24 Jun 2020 16:43:51 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 5B943113848E; Wed, 24 Jun 2020 18:43:45 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1593017035; 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=llJpMUzvWW20uociDU4J65diVE7S1pkbg91SWigNGH0=; b=TP621wNxwxHb9NMox+AqgFo/tfGGFEF6NEuuM+vyLgU0Az1dJeyOm7soX/TBbKLrPv+uw8 AMtqOrUcq32hjVx+49MNc9fWDFlHVqTyHY1oRYfF5d3czHrGLZrCdUGGSpqiGn3iUE9vd8 OnNc7hDoKiUll9R5y7uQv01SCP2O08k= X-MC-Unique: 23J10o4jPI2Q5aoCPfY7qg-1 From: Markus Armbruster To: qemu-devel@nongnu.org Subject: [PATCH 33/46] qom: Crash more nicely on object_property_get_link() failure Date: Wed, 24 Jun 2020 18:43:31 +0200 Message-Id: <20200624164344.3778251-34-armbru@redhat.com> In-Reply-To: <20200624164344.3778251-1-armbru@redhat.com> References: <20200624164344.3778251-1-armbru@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=armbru@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com 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=207.211.31.120; envelope-from=armbru@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/06/24 02:33:25 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1, 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.01, RCVD_IN_MSPIKE_WL=-0.01, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=_AUTOLEARN 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: peter.maydell@linaro.org, vsementsov@virtuozzo.com, berrange@redhat.com, ehabkost@redhat.com, qemu-block@nongnu.org, pbonzini@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" Pass &error_abort instead of NULL where the returned value is dereferenced or asserted to be non-null. Signed-off-by: Markus Armbruster --- hw/core/platform-bus.c | 5 +++-- hw/ppc/spapr_drc.c | 3 ++- hw/ppc/spapr_hcall.c | 3 ++- hw/ppc/spapr_pci_nvlink2.c | 8 +++++--- ui/vnc.c | 2 +- 5 files changed, 13 insertions(+), 8 deletions(-) diff --git a/hw/core/platform-bus.c b/hw/core/platform-bus.c index d494e5cec1..b700ff45fe 100644 --- a/hw/core/platform-bus.c +++ b/hw/core/platform-bus.c @@ -22,6 +22,7 @@ #include "qemu/osdep.h" #include "hw/platform-bus.h" #include "hw/qdev-properties.h" +#include "qapi/error.h" #include "qemu/error-report.h" #include "qemu/module.h" =20 @@ -63,8 +64,8 @@ hwaddr platform_bus_get_mmio_addr(PlatformBusDevice *pbus= , SysBusDevice *sbdev, return -1; } =20 - parent_mr =3D object_property_get_link(OBJECT(sbdev_mr), "container", = NULL); - + parent_mr =3D object_property_get_link(OBJECT(sbdev_mr), "container", + &error_abort); assert(parent_mr); if (parent_mr !=3D pbus_mr_obj) { /* MMIO region is not mapped on platform bus */ diff --git a/hw/ppc/spapr_drc.c b/hw/ppc/spapr_drc.c index c8e8ba2ee8..43d12bc33a 100644 --- a/hw/ppc/spapr_drc.c +++ b/hw/ppc/spapr_drc.c @@ -867,7 +867,8 @@ int spapr_dt_drc(void *fdt, int offset, Object *owner, = uint32_t drc_type_mask) continue; } =20 - obj =3D object_property_get_link(root_container, prop->name, NULL); + obj =3D object_property_get_link(root_container, prop->name, + &error_abort); drc =3D SPAPR_DR_CONNECTOR(obj); drck =3D SPAPR_DR_CONNECTOR_GET_CLASS(drc); =20 diff --git a/hw/ppc/spapr_hcall.c b/hw/ppc/spapr_hcall.c index 0f54988f2e..c1d01228c6 100644 --- a/hw/ppc/spapr_hcall.c +++ b/hw/ppc/spapr_hcall.c @@ -1655,7 +1655,8 @@ static void spapr_handle_transient_dev_before_cas(Spa= prMachineState *spapr) continue; } drc =3D SPAPR_DR_CONNECTOR(object_property_get_link(drc_container, - prop->name, NULL= )); + prop->name, + &error_abort)); =20 if (spapr_drc_transient(drc)) { spapr_drc_reset(drc); diff --git a/hw/ppc/spapr_pci_nvlink2.c b/hw/ppc/spapr_pci_nvlink2.c index 8332d5694e..e4e09a93e6 100644 --- a/hw/ppc/spapr_pci_nvlink2.c +++ b/hw/ppc/spapr_pci_nvlink2.c @@ -141,9 +141,10 @@ static void spapr_phb_pci_collect_nvgpu(PCIBus *bus, P= CIDevice *pdev, if (tgt) { Error *local_err =3D NULL; SpaprPhbPciNvGpuConfig *nvgpus =3D opaque; - Object *mr_gpu =3D object_property_get_link(po, "nvlink2-mr[0]", N= ULL); + Object *mr_gpu =3D object_property_get_link(po, "nvlink2-mr[0]", + &error_abort); Object *mr_npu =3D object_property_get_link(po, "nvlink2-atsd-mr[0= ]", - NULL); + &error_abort); =20 g_assert(mr_gpu || mr_npu); if (mr_gpu) { @@ -358,7 +359,8 @@ void spapr_phb_nvgpu_ram_populate_dt(SpaprPhbState *sph= b, void *fdt) for (i =3D 0; i < sphb->nvgpus->num; ++i) { SpaprPhbPciNvGpuSlot *nvslot =3D &sphb->nvgpus->slots[i]; Object *nv_mrobj =3D object_property_get_link(OBJECT(nvslot->gpdev= ), - "nvlink2-mr[0]", NULL); + "nvlink2-mr[0]", + &error_abort); uint32_t associativity[] =3D { cpu_to_be32(0x4), SPAPR_GPU_NUMA_ID, diff --git a/ui/vnc.c b/ui/vnc.c index 527ad25124..f006aa1afd 100644 --- a/ui/vnc.c +++ b/ui/vnc.c @@ -568,7 +568,7 @@ VncInfo2List *qmp_query_vnc_servers(Error **errp) &info->vencrypt, &info->has_vencrypt); if (vd->dcl.con) { dev =3D DEVICE(object_property_get_link(OBJECT(vd->dcl.con), - "device", NULL)); + "device", &error_abort)); info->has_display =3D true; info->display =3D g_strdup(dev->id); } --=20 2.26.2