From nobody Sat Nov 29 10:46:54 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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=pass(p=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1764204377; cv=none; d=zohomail.com; s=zohoarc; b=b7f+e5OgMOseYHmXnK7lY41I9Y98dazo5DPFVr1QzN397OZfBZ2B/T8r0GhiMmrjzLva8vYNc5EUwPeiAED1uESwT9RQEG/SXAS+T2jM1tzlLgSXhajEoRbDyHalavJ04h4ABJDdkCM6r4SZYQa59cGHbcKB+gtL+WX5jgpY5A0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1764204377; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=dTekhLTcHwbGmgTlG6sTMWagdp+bTk7K42A4+/BFuI8=; b=ZL8Jvl825wC6f9RKPgApfONSVXsmbpX2ekiiqr3A4coSi4JWFszyCVXr5HolG9Su1oz7xXODtCrNzuA0JsdBL8HDnmhGCr7yimEssCjmCt83LxwHjaHu/SYs7qWz7OHO6paC30Sl6DDW7iaaN6oWLrgBoerasUndAVudCPMGP1I= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1764204377083840.3551075560231; Wed, 26 Nov 2025 16:46:17 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vOQ8f-0000jx-MN; Wed, 26 Nov 2025 19:45:37 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vOQ8e-0000j9-MQ for qemu-devel@nongnu.org; Wed, 26 Nov 2025 19:45:36 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vOQ8d-0006hd-7O for qemu-devel@nongnu.org; Wed, 26 Nov 2025 19:45:36 -0500 Received: from mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-540-shSviguEOXyAfnEqIxCqEA-1; Wed, 26 Nov 2025 19:45:27 -0500 Received: from mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.93]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id E34E21956080; Thu, 27 Nov 2025 00:45:25 +0000 (UTC) Received: from gshan-thinkpadx1nanogen2.rmtau.csb (unknown [10.64.136.67]) by mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id A25DC18004A3; Thu, 27 Nov 2025 00:45:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1764204334; 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=dTekhLTcHwbGmgTlG6sTMWagdp+bTk7K42A4+/BFuI8=; b=agj+VbagtfEkGu4aLNrFscgJkwE3xBGW/mVlRDHVQXitAN2UQpWJnupkvHN6LPdY6Al2n9 Mhn4zwMH9DXd+oBo/x+CDEt3mkKHsvD6Ze/RrMjJTDqNJfXWLtVKN1iYGdC4Vkq//i1Xvl BLWtYTP1bfF3dftEUGUwiveiwOSdg6Y= X-MC-Unique: shSviguEOXyAfnEqIxCqEA-1 X-Mimecast-MFC-AGG-ID: shSviguEOXyAfnEqIxCqEA_1764204326 From: Gavin Shan To: qemu-arm@nongnu.org Cc: qemu-devel@nongnu.org, mchehab+huawei@kernel.org, jonathan.cameron@huawei.com, armbru@redhat.com, mst@redhat.com, imammedo@redhat.com, anisinha@redhat.com, gengdongjiu1@gmail.com, peter.maydell@linaro.org, pbonzini@redhat.com, shan.gavin@gmail.com Subject: [PATCH 4/5] acpi/ghes: Bail early on error from get_ghes_source_offsets() Date: Thu, 27 Nov 2025 10:44:34 +1000 Message-ID: <20251127004435.2098335-5-gshan@redhat.com> In-Reply-To: <20251127004435.2098335-1-gshan@redhat.com> References: <20251127004435.2098335-1-gshan@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.93 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=170.10.133.124; envelope-from=gshan@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -22 X-Spam_score: -2.3 X-Spam_bar: -- X-Spam_report: (-2.3 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.224, 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.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1764204379277019200 Content-Type: text/plain; charset="utf-8" For one particular error (Error), we can't call error_setg() for twice. Otherwise, the assert(*errp =3D=3D NULL) will be triggered unexpectedly in error_setv(). In ghes_record_cper_errors(), get_ghes_source_offsets() can return a error initialized by error_setg(). Without bailing on this error, it can call into the second error_setg() due to the unexpected value from the read acknowledgement register. Bail early in ghes_record_cper_errors() when error is received from get_ghes_source_offsets() to avoid the exception. Signed-off-by: Gavin Shan Reviewed-by: Jonathan Cameron Reviewed-by: Markus Armbruster --- hw/acpi/ghes.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/hw/acpi/ghes.c b/hw/acpi/ghes.c index 6366c74248..c35883dfa9 100644 --- a/hw/acpi/ghes.c +++ b/hw/acpi/ghes.c @@ -443,7 +443,7 @@ static void get_hw_error_offsets(uint64_t ghes_addr, *read_ack_register_addr =3D ghes_addr + sizeof(uint64_t); } =20 -static void get_ghes_source_offsets(uint16_t source_id, +static bool get_ghes_source_offsets(uint16_t source_id, uint64_t hest_addr, uint64_t *cper_addr, uint64_t *read_ack_start_addr, @@ -474,7 +474,7 @@ static void get_ghes_source_offsets(uint16_t source_id, /* For now, we only know the size of GHESv2 table */ if (type !=3D ACPI_GHES_SOURCE_GENERIC_ERROR_V2) { error_setg(errp, "HEST: type %d not supported.", type); - return; + return false; } =20 /* Compare CPER source ID at the GHESv2 structure */ @@ -488,7 +488,7 @@ static void get_ghes_source_offsets(uint16_t source_id, } if (i =3D=3D num_sources) { error_setg(errp, "HEST: Source %d not found.", source_id); - return; + return false; } =20 /* Navigate through table address pointers */ @@ -508,6 +508,8 @@ static void get_ghes_source_offsets(uint16_t source_id, cpu_physical_memory_read(hest_read_ack_addr, read_ack_start_addr, sizeof(*read_ack_start_addr)); *read_ack_start_addr =3D le64_to_cpu(*read_ack_start_addr); + + return true; } =20 NotifierList acpi_generic_error_notifiers =3D @@ -526,9 +528,10 @@ void ghes_record_cper_errors(AcpiGhesState *ags, const= void *cper, size_t len, if (!ags->use_hest_addr) { get_hw_error_offsets(le64_to_cpu(ags->hw_error_le), &cper_addr, &read_ack_register_addr); - } else { - get_ghes_source_offsets(source_id, le64_to_cpu(ags->hest_addr_le), - &cper_addr, &read_ack_register_addr, errp); + } else if (!get_ghes_source_offsets(source_id, + le64_to_cpu(ags->hest_addr_le), + &cper_addr, &read_ack_register_addr, errp)) { + return; } =20 cpu_physical_memory_read(read_ack_register_addr, --=20 2.51.1