Received: by 2002:ac2:52b1:0:0:0:0:0 with SMTP id r17csp612470lfm; Wed, 22 Apr 2020 06:07:48 -0700 (PDT) X-Google-Smtp-Source: APiQypJFL4uA2d8Pqvoo7V6JC43E6OBql3g5q0QlP2VWJ0NEjeIm50SVFR2Yv28toekg5BjdZR7A X-Received: by 2002:ac8:6b51:: with SMTP id x17mr26522030qts.157.1587560868424; Wed, 22 Apr 2020 06:07:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1587560868; cv=none; d=google.com; s=arc-20160816; b=Kep6qDAGXcOSmf1b8/idzE1iLRPpetlIhf/optPaZrTaU1pqHrFxgTrDLN9t0pas5t uVuUmQkh0sjndBsnrECnVk+iUNjQt5pfc7ngzihHFHEDb45dgFGuBHGbbcK7zoDUCOYK 8lN+O7bZ5IodoW+lEQPGuKwIIeTCWu/SksEBkqCq0s37ELxEr2bVxhnhzJAG6i56+B4E 1mSN+u+rj+0/9JAVZR+SRLG8CpHgUbzr6Z0TLPiBzGbYIVWNGJLD2XQefxtvCPhESx3w xnFuWK73AooMMXTuINN42lpCbWZsL//FineGtrrUaL3DcCeoNS2FtuMgVNXXCmhDuhZW 6YyA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=oGgKscofsQygorrpqjNCPgIrftyN69zP62MTnCqjIBo=; b=Ep3n1Xq1SC4t+0yErdLzXGVEptpRd8I1hKDy1Oztcsh2r9IXUpdbt3bVhuuOV3eKz1 4qAJgZRlNqJQlsOyxoTVC3x/zNVxorw5pT44DSfxLVhk82Wp1WS2ns+QRqLpsdKcPKhn 8J5ejLu6As4UC7mnbqcV7u46F3PXOe9T0Dbw8ARHhRsbEVs/nf2ZP/JYTHCmENsUzRDl hnWusZZkQMtukv72UYChhQySbOukiBka7uEhvmbResLoA7Ba7nmd7czyVAuvcWhO1an+ Ag3fml28ppsaMq31ab/HlzTyMXtG0wSOalsSSEZ/OjxOMQkUVP7lvefP1CMJi82oplwW xPVA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=FTqbFq7J; spf=pass (google.com: domain of qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id u15si3383059qkm.210.2020.04.22.06.07.48 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 22 Apr 2020 06:07:48 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=FTqbFq7J; spf=pass (google.com: domain of qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from localhost ([::1]:50226 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jRF6R-0003r1-Mj for alex.bennee@linaro.org; Wed, 22 Apr 2020 09:07:47 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46854) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jRF68-0003m1-VO for qemu-arm@nongnu.org; Wed, 22 Apr 2020 09:07:30 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.90_1) (envelope-from ) id 1jRF67-0003o5-IH for qemu-arm@nongnu.org; Wed, 22 Apr 2020 09:07:28 -0400 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:46258 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 1jRF67-0003kL-1y for qemu-arm@nongnu.org; Wed, 22 Apr 2020 09:07:27 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1587560846; 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=oGgKscofsQygorrpqjNCPgIrftyN69zP62MTnCqjIBo=; b=FTqbFq7JU+nh6cDX9YmwFaSW/jAq2jx4F0kQYOjvWMl2D3at2ptVUFOLglM/wY8+d2XYhh oqCS7C4btBresV4f1wMzMzvV3Cj6qDJNjH5++pFLQ/Wub8BWo6QYVdjTcs6aJ32lzd5IFp 8NznVJ5tuUcER6AewToa3IbVEiVONoU= 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-349-wnw-nJ2PPd-N1onAB1v74A-1; Wed, 22 Apr 2020 09:07:24 -0400 X-MC-Unique: wnw-nJ2PPd-N1onAB1v74A-1 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 3E19C1030980; Wed, 22 Apr 2020 13:07:23 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-113-6.ams2.redhat.com [10.36.113.6]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 0BAE710027BA; Wed, 22 Apr 2020 13:07:23 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 0E09811358C1; Wed, 22 Apr 2020 15:07:20 +0200 (CEST) From: Markus Armbruster To: qemu-devel@nongnu.org Subject: [PATCH v2 05/14] arm/virt: Fix virt_machine_device_plug_cb() error API violation Date: Wed, 22 Apr 2020 15:07:10 +0200 Message-Id: <20200422130719.28225-6-armbru@redhat.com> In-Reply-To: <20200422130719.28225-1-armbru@redhat.com> References: <20200422130719.28225-1-armbru@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 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 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/04/22 09:07:24 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 207.211.31.120 X-BeenThere: qemu-arm@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 , qemu-arm@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org Sender: "Qemu-arm" X-TUID: cPMXv5bm3cSK The Error ** argument must be NULL, &error_abort, &error_fatal, or a pointer to a variable containing NULL. Passing an argument of the latter kind twice without clearing it in between is wrong: if the first call sets an error, it no longer points to NULL for the second call. virt_machine_device_plug_cb() passes @errp to cryptodev_builtin_sym_close_session() in a loop. Harmless, because cryptodev_builtin_sym_close_session() can't actually fail. Fix by dropping its Error ** parameter. Cc: Peter Maydell Cc: qemu-arm@nongnu.org Signed-off-by: Markus Armbruster Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- hw/arm/virt.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hw/arm/virt.c b/hw/arm/virt.c index 7dc96abf72..cca5316256 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -1186,7 +1186,7 @@ static void create_smmu(const VirtMachineState *vms, g_free(node); } =20 -static void create_virtio_iommu_dt_bindings(VirtMachineState *vms, Error *= *errp) +static void create_virtio_iommu_dt_bindings(VirtMachineState *vms) { const char compat[] =3D "virtio,pci-iommu"; uint16_t bdf =3D vms->virtio_iommu_bdf; @@ -2118,7 +2118,7 @@ static void virt_machine_device_plug_cb(HotplugHandle= r *hotplug_dev, =20 vms->iommu =3D VIRT_IOMMU_VIRTIO; vms->virtio_iommu_bdf =3D pci_get_bdf(pdev); - create_virtio_iommu_dt_bindings(vms, errp); + create_virtio_iommu_dt_bindings(vms); } } =20 --=20 2.21.1