From nobody Sat Nov 15 04:15:16 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=1592987938; cv=none; d=zohomail.com; s=zohoarc; b=f8LreheyOhkBxodXBLAC8vslEPoLSMtykKLcenhNRD86ESnWlMFSkUGjRJeVQyhFDq4LYspJ0Eoe6vAm1gtVW8D3Q/XO4fMLBuYX5mTSddqLJ/Cu+ZHm2qzgxXhOwM/03PCa/Oyfq0v7v/Ktvf4v1RQf/MduVskAXD4v5vaZlQI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1592987938; 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=gZGpqjNhU3VLrZIjNN+wDj8VUXVmtMcVJTCwh6ZL+O0=; b=J4umSt+p36aZ/Q53yN43ugurNFw7+AnWaIwEI+qR5vuZgrtpz1Pkdt4Ogmu+CDPjiHxwRjvYAKMAn5oStnOiMKUwGqxUmhA2KsyE09NTTPVL4b1cWVrD1/D4ZgTnvOHC0lk7HBHkTNaTWgCeJjWg9Wn4CEP3uONr01iF73cjt9Q= 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 1592987938057993.3573212142871; Wed, 24 Jun 2020 01:38:58 -0700 (PDT) Received: from localhost ([::1]:40070 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jo0vo-00038u-RS for importer@patchew.org; Wed, 24 Jun 2020 04:38:56 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:48398) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jo0um-0000nv-Ok for qemu-devel@nongnu.org; Wed, 24 Jun 2020 04:37:52 -0400 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:30914 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 1jo0ug-00025J-Da for qemu-devel@nongnu.org; Wed, 24 Jun 2020 04:37:52 -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-458-mvuRLvRBM6--BA6Bu4nHuA-1; Wed, 24 Jun 2020 04:37:44 -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 402A61005512; Wed, 24 Jun 2020 08:37:43 +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 059EF78FDB; Wed, 24 Jun 2020 08:37:43 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id C347D1138482; Wed, 24 Jun 2020 10:37:37 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1592987865; 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=gZGpqjNhU3VLrZIjNN+wDj8VUXVmtMcVJTCwh6ZL+O0=; b=QZ7iu2MPkCuhsogzoaQNYYS32jXYHIukRAiBZw/Y4TKcYBzexXvcKy1O3NBYU8hw/wKnB3 cE3Uz9oGLtFjwL8UWD9ppA6DxhNwgcFL4GIE+lwVUNtN1laaZOIOl8LlzOO/Ypu/sdAKsQ rZAcJ8uH4yxpelg43NIjkAvdcvo9tyA= X-MC-Unique: mvuRLvRBM6--BA6Bu4nHuA-1 From: Markus Armbruster To: qemu-devel@nongnu.org Subject: [PATCH v2 20/25] x86: Fix x86_cpu_new() error API violations Date: Wed, 24 Jun 2020 10:37:32 +0200 Message-Id: <20200624083737.3086768-21-armbru@redhat.com> In-Reply-To: <20200624083737.3086768-1-armbru@redhat.com> References: <20200624083737.3086768-1-armbru@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 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=205.139.110.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 03:27:53 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: Paolo Bonzini , Eduardo Habkost , Richard Henderson 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" 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. x86_cpu_new() is wrong that way: it passes &local_err to object_property_set_uint() without checking it, and then to qdev_realize(). Harmless, because the former can't actually fail here. Fix by checking for failure right away. While there, replace qdev_realize(); object_unref() by qdev_realize_and_unref(). Cc: Paolo Bonzini Cc: Richard Henderson Cc: Eduardo Habkost Signed-off-by: Markus Armbruster --- hw/i386/x86.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/hw/i386/x86.c b/hw/i386/x86.c index 34229b45c7..3a7029e6db 100644 --- a/hw/i386/x86.c +++ b/hw/i386/x86.c @@ -118,16 +118,10 @@ uint32_t x86_cpu_apic_id_from_index(X86MachineState *= x86ms, =20 void x86_cpu_new(X86MachineState *x86ms, int64_t apic_id, Error **errp) { - Object *cpu =3D NULL; - Error *local_err =3D NULL; + Object *cpu =3D object_new(MACHINE(x86ms)->cpu_type); =20 - cpu =3D object_new(MACHINE(x86ms)->cpu_type); - - object_property_set_uint(cpu, apic_id, "apic-id", &local_err); - qdev_realize(DEVICE(cpu), NULL, &local_err); - - object_unref(cpu); - error_propagate(errp, local_err); + object_property_set_uint(cpu, apic_id, "apic-id", &error_abort); + qdev_realize_and_unref(DEVICE(cpu), NULL, errp); } =20 void x86_cpus_init(X86MachineState *x86ms, int default_cpu_version) --=20 2.26.2