From nobody Mon Feb 9 20:11:29 2026 Delivered-To: importer@patchew.org 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; 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=1576657159; cv=none; d=zohomail.com; s=zohoarc; b=kGD9S+GB5noV7kl6qS8c1iOueaCvmgGuv5FOL2PR/IqNWsF+RPtHHZHP2tACZwLOvqEJe6br5Vag9iCYcIsOi7d47kmUoIZrseRIiycTssw1yROeOVrK8m4i0Mx5ujH6vcg3zh88Ebv5SYxha6Osmt7Z2c1/2g79dW/e5G4dDl0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1576657159; 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=QVnaCBinN0VE5AFdXTdiBTMzWvyDhGUr6yaVglp9a9g=; b=awwWkjl5hEYngtkZDcyS9SeNhVKvAHxVBqHsNVPWsWLo5LQj/3HDtV02YLfPOzyjkjX223STiiTzoYE0njr1vygaPhSMhRlj1NKe3XPuqP0Vlx1Fa1OKGAO34+1cAGNMyB5//S5UPn3goF2oPDUdrUF0uTBwcQm1ZXfS7ACq2KY= 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 1576657159240640.1895697534479; Wed, 18 Dec 2019 00:19:19 -0800 (PST) Received: from localhost ([::1]:50914 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ihUY9-0007uR-MD for importer@patchew.org; Wed, 18 Dec 2019 03:19:17 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:35468) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ihUWR-0005wg-GQ for qemu-devel@nongnu.org; Wed, 18 Dec 2019 03:17:32 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ihUWP-0002RL-Ok for qemu-devel@nongnu.org; Wed, 18 Dec 2019 03:17:31 -0500 Received: from us-smtp-1.mimecast.com ([207.211.31.81]:20734 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ihUWP-0002Pl-FN for qemu-devel@nongnu.org; Wed, 18 Dec 2019 03:17:29 -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-39-LFoEcHSEMp6eohWNjqWZhg-1; Wed, 18 Dec 2019 03:17:27 -0500 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id E206F800D48 for ; Wed, 18 Dec 2019 08:17:26 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-116-42.ams2.redhat.com [10.36.116.42]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 40A9D5D9E5; Wed, 18 Dec 2019 08:17:24 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 68E6211385D4; Wed, 18 Dec 2019 09:17:21 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1576657049; 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=QVnaCBinN0VE5AFdXTdiBTMzWvyDhGUr6yaVglp9a9g=; b=EknfO7cD6ZdmimJNkCyUj8N54LZJaWOGXHPEdGfPBUIApO08UVwlhD3NL2BBTboE+sG1b3 mSfrQ9TLVVuO50l6v0iFFHVEg14V/+Xb9dn/9QioS6ikT5y+ORegc6sTmlausAKM8Qc0lc Tq3um/mClnbScBh1QW8Bzw51v+AX5DQ= From: Markus Armbruster To: qemu-devel@nongnu.org Subject: [PULL v2 07/35] hw/acpi: Fix legacy CPU plug error API violations Date: Wed, 18 Dec 2019 09:16:53 +0100 Message-Id: <20191218081721.23520-8-armbru@redhat.com> In-Reply-To: <20191218081721.23520-1-armbru@redhat.com> References: <20191218081721.23520-1-armbru@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-MC-Unique: LFoEcHSEMp6eohWNjqWZhg-1 X-Mimecast-Spam-Score: 0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 207.211.31.81 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: Igor Mammedov , "Michael S. Tsirkin" 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" legacy_acpi_cpu_plug_cb() dereferences @errp when acpi_set_cpu_present_bit() fails. That's wrong; see the big comment in error.h. Introduced in commit cc43364de7 "acpi/cpu-hotplug: introduce helper function to keep bit setting in one place". No caller actually passes null, and acpi_set_cpu_present_bit() can't actually fail. Fix anyway: drop acpi_set_cpu_present_bit()'s @errp parameter. Cc: "Michael S. Tsirkin" Cc: Igor Mammedov Signed-off-by: Markus Armbruster Reviewed-by: Igor Mammedov Message-Id: <20191204093625.14836-7-armbru@redhat.com> Reviewed-by: Michael S. Tsirkin --- hw/acpi/cpu_hotplug.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/hw/acpi/cpu_hotplug.c b/hw/acpi/cpu_hotplug.c index 3ac2045a95..9c3bcc84de 100644 --- a/hw/acpi/cpu_hotplug.c +++ b/hw/acpi/cpu_hotplug.c @@ -55,8 +55,7 @@ static const MemoryRegionOps AcpiCpuHotplug_ops =3D { }, }; =20 -static void acpi_set_cpu_present_bit(AcpiCpuHotplug *g, CPUState *cpu, - Error **errp) +static void acpi_set_cpu_present_bit(AcpiCpuHotplug *g, CPUState *cpu) { CPUClass *k =3D CPU_GET_CLASS(cpu); int64_t cpu_id; @@ -74,10 +73,7 @@ static void acpi_set_cpu_present_bit(AcpiCpuHotplug *g, = CPUState *cpu, void legacy_acpi_cpu_plug_cb(HotplugHandler *hotplug_dev, AcpiCpuHotplug *g, DeviceState *dev, Error **= errp) { - acpi_set_cpu_present_bit(g, CPU(dev), errp); - if (*errp !=3D NULL) { - return; - } + acpi_set_cpu_present_bit(g, CPU(dev)); acpi_send_event(DEVICE(hotplug_dev), ACPI_CPU_HOTPLUG_STATUS); } =20 @@ -92,7 +88,7 @@ void legacy_acpi_cpu_hotplug_init(MemoryRegion *parent, O= bject *owner, gpe_cpu->device =3D owner; =20 CPU_FOREACH(cpu) { - acpi_set_cpu_present_bit(gpe_cpu, cpu, &error_abort); + acpi_set_cpu_present_bit(gpe_cpu, cpu); } } =20 --=20 2.21.0