From nobody Sun Jul 26 11:03:38 2026 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=1782984288; cv=none; d=zohomail.com; s=zohoarc; b=h5lC+Gi6+fmND+loQfOWbAo7si4opwwHoISCEJtCZ9KPan6Ixc1lBtV1mM1MrdAmRQzY93Wrr4FzbzAAObl0rJr7+OZn0X1MujCUHdyWieiocD77qdsiwwqOhEz2x8J+OPXihGr7fNpHbez+WJdl2Oh+nZ1qinG6txbN7kb65bs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1782984288; h=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=Ha4XTpT+RqnbRJPQX2PzEMZ+ZMG44RCEdXff0/ITp0A=; b=RbfvqdGX0CD+65KFFK90BYyEb2aE7Kvk9pGPjR4Rqj40zEe3b3rGw250RDDoq/j99E1yWWUKpdveOilIi3kyo1eno97hxT4xmoyl6rpWc2VhIQnvTFmx3NW5rYdP13jb95aksqmwUqKV9BHHVR+XKGnF8+CksaAJdP9gyrnsYsM= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1782984275820724.4580542962208; Thu, 2 Jul 2026 02:24:35 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wfDeI-0005Nx-Qn; Thu, 02 Jul 2026 05:23:58 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wfDeH-0005Nh-4O for qemu-devel@nongnu.org; Thu, 02 Jul 2026 05:23:57 -0400 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 1wfDeF-0005uB-DL for qemu-devel@nongnu.org; Thu, 02 Jul 2026 05:23:56 -0400 Received: from mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-626-u4fK1_dAMr6zC4sHk_tm5g-1; Thu, 02 Jul 2026 05:23:52 -0400 Received: from mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.12]) (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-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 5D6E118333AD; Thu, 2 Jul 2026 09:23:51 +0000 (UTC) Received: from sirius.home.kraxel.org (unknown [10.44.48.8]) by mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id C5D161966660; Thu, 2 Jul 2026 09:23:50 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 9EEFA1800D63; Thu, 02 Jul 2026 11:23:49 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1782984233; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Ha4XTpT+RqnbRJPQX2PzEMZ+ZMG44RCEdXff0/ITp0A=; b=S0QtWEXXBGH9F57/QZWyPeXvoeJI6dIDuYPp6xMJOQk2k5NXeeOWmJ4vMMG5LjThaOLt0p FzsZ54zwUBEyu8Tq2cNtq53FByRmJZYRxSoDu3BnR0ady7jJkSwRx+7VFLkguxAd+eV4mE FN8dILwQ2HvwhSH/3WnJm9TjyR2OPr8= X-MC-Unique: u4fK1_dAMr6zC4sHk_tm5g-1 X-Mimecast-MFC-AGG-ID: u4fK1_dAMr6zC4sHk_tm5g_1782984231 From: Gerd Hoffmann To: qemu-devel@nongnu.org Cc: Gerd Hoffmann , peter.maydell@linaro.org Subject: [PATCH v2 1/2] hw/uefi: add sanity check Date: Thu, 2 Jul 2026 11:23:46 +0200 Message-ID: <20260702092349.4183512-2-kraxel@redhat.com> In-Reply-To: <20260702092349.4183512-1-kraxel@redhat.com> References: <20260702092349.4183512-1-kraxel@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.0 on 10.30.177.12 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=lists1p.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=kraxel@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -24 X-Spam_score: -2.5 X-Spam_bar: -- X-Spam_report: (-2.5 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.445, 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_H4=0.001, RCVD_IN_MSPIKE_WL=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: qemu development 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: 1782984291366158500 Content-Type: text/plain; charset="utf-8" Verify the passed buffer has the minimal required length before reading the size field + verifying the total length. Fixes: CVE-2026-58581 Resolves: https://gitlab.com/qemu-project/qemu/-/work_items/3614 Signed-off-by: Gerd Hoffmann --- hw/uefi/var-service-policy.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/hw/uefi/var-service-policy.c b/hw/uefi/var-service-policy.c index 58da4adbebaf..989bf87ddb86 100644 --- a/hw/uefi/var-service-policy.c +++ b/hw/uefi/var-service-policy.c @@ -276,6 +276,9 @@ static uint32_t uefi_vars_mm_check_policy_register(uefi= _vars_state *uv, uefi_var_policy *pol; uint64_t length; =20 + if (mhdr->length < sizeof(*mchk) + sizeof(*pe)) { + return uefi_vars_mm_policy_error(mhdr, mchk, EFI_BAD_BUFFER_SIZE); + } if (uadd64_overflow(sizeof(*mchk), pe->size, &length)) { return uefi_vars_mm_policy_error(mhdr, mchk, EFI_BAD_BUFFER_SIZE); } --=20 2.55.0 From nobody Sun Jul 26 11:03:38 2026 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=1782984308; cv=none; d=zohomail.com; s=zohoarc; b=GQylrIFVPEpSZIbJckQZjoiez/IPEhs9+J5PFotbIk+/Ti1VtAJxrMaqHFJDUXjz+v34w4J1SYYaPDPEVdx7NxBkYDjnTDOCEq3n046wUrNXHR3e4xKwnARFKzCQ4BRZKddMPzo89f9E+JQ/I9xfNedNf7JIPWYBeeR3L+pVRs0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1782984308; 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=3V3CXvvH2NXUkWs8mV7EVNFrfm22A/C0O13gkRy4+7w=; b=d8yHmpimy1WjkqOSaE+qpazkRZTtiD0yxjJcU7K9R/62o6X210ZODkJkLbs+IiGnVLPLzw/Xz7iLVZzR8Novx25bSvSkWudpQW9U1wGDd7Un6QT/YKbIGoDDqRFbMnWdaKB3tXXl79UfxAOWxiC3AzSfoiqZatlHbnxckGjQ1cI= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1782984296446326.9327733557931; Thu, 2 Jul 2026 02:24:56 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wfDeM-0005P0-CR; Thu, 02 Jul 2026 05:24:02 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wfDeJ-0005OD-Gh for qemu-devel@nongnu.org; Thu, 02 Jul 2026 05:23:59 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wfDeH-0005uO-SG for qemu-devel@nongnu.org; Thu, 02 Jul 2026 05:23:59 -0400 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-231-c4d_ORKlPBe34E2xW-PvAw-1; Thu, 02 Jul 2026 05:23:53 -0400 Received: from mx-prod-int-10.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-10.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.95]) (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 DD0C7195395C; Thu, 2 Jul 2026 09:23:52 +0000 (UTC) Received: from sirius.home.kraxel.org (unknown [10.44.48.8]) by mx-prod-int-10.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 5EAFD36F05; Thu, 2 Jul 2026 09:23:52 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id B25F71800DE4; Thu, 02 Jul 2026 11:23:49 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1782984237; 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=3V3CXvvH2NXUkWs8mV7EVNFrfm22A/C0O13gkRy4+7w=; b=WVlO6sqci7dU1CpY48uugt5BKDlYRuJtzFP9f+gbuECtP4/kfUiQueMTfRhkvDlrUt5ugb huJkrcrSOgz2UDP2Qzz6GZWxN91ueUW+8zn9491rlWpltKl9ipbGMzX9sMoQwD3+kPl+6q DqHaexONVWjUVE2SfbN+hBSsOF28x4M= X-MC-Unique: c4d_ORKlPBe34E2xW-PvAw-1 X-Mimecast-MFC-AGG-ID: c4d_ORKlPBe34E2xW-PvAw_1782984233 From: Gerd Hoffmann To: qemu-devel@nongnu.org Cc: Gerd Hoffmann , peter.maydell@linaro.org Subject: [PATCH v2 2/2] hw/uefi: disable debug function Date: Thu, 2 Jul 2026 11:23:47 +0200 Message-ID: <20260702092349.4183512-3-kraxel@redhat.com> In-Reply-To: <20260702092349.4183512-1-kraxel@redhat.com> References: <20260702092349.4183512-1-kraxel@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.6 on 10.30.177.95 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=lists1p.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=kraxel@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: 8 X-Spam_score: 0.8 X-Spam_bar: / X-Spam_report: (0.8 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.445, 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_SBL_CSS=3.335, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development 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: 1782984311656158500 This was never meant to be active in production builds. It's a code path not hit on a normal boot (OVMF wouldn't try variable updates which are not allowed), so this went unnoticed. Wrap the call into "if (VARIABLE_POLICY_DEBUG)" so it is never used unless the #define is changed to true. Also fix the name printing to not overrun the entry size. Fixes: CVE-2026-58582 Resolves: https://gitlab.com/qemu-project/qemu/-/work_items/3615 Signed-off-by: Gerd Hoffmann --- hw/uefi/var-service-policy.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/hw/uefi/var-service-policy.c b/hw/uefi/var-service-policy.c index 989bf87ddb86..b56fc62f7092 100644 --- a/hw/uefi/var-service-policy.c +++ b/hw/uefi/var-service-policy.c @@ -16,6 +16,8 @@ =20 #include "trace.h" =20 +#define VARIABLE_POLICY_DEBUG 0 + static void calc_policy(uefi_var_policy *pol); =20 static int uefi_var_policy_post_load(void *opaque, int version_id) @@ -40,11 +42,12 @@ const VMStateDescription vmstate_uefi_var_policy =3D { static void print_policy_entry(variable_policy_entry *pe) { uint16_t *name =3D (void *)pe + pe->offset_to_name; + uint16_t *end =3D (void *)pe + pe->size; =20 fprintf(stderr, "%s:\n", __func__); =20 fprintf(stderr, " name =C2=B4"); - while (*name) { + while (*name && name < end) { fprintf(stderr, "%c", *name); name++; } @@ -173,7 +176,9 @@ efi_status uefi_vars_policy_check(uefi_vars_state *uv, pe =3D pol->entry; =20 uefi_trace_variable(__func__, var->guid, var->name, var->name_size); - print_policy_entry(pe); + if (VARIABLE_POLICY_DEBUG) { + print_policy_entry(pe); + } =20 if ((var->attributes & pe->attributes_must_have) !=3D pe->attributes_m= ust_have) { trace_uefi_vars_policy_deny("must-have-attr"); --=20 2.55.0