From nobody Sat Jul 25 11:02:42 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=1784558423; cv=none; d=zohomail.com; s=zohoarc; b=AOgBSZy9dS6K8uWwbYcKm3dV0qc7MeknHr19Z0KrK9Fi/s8UPjieWXlqwSFhYc3taWSzm+WTHD4Mo2kIIV7szmHjQDRpJCHJj5PVMs4dalUfHGiffHxJ6hPJGO2VTO5ESC5CL/uCzDjnUnZvRGCdR8N/YxjxTsK/MuTfh9jYZ0k= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1784558423; 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=SgKivmy6jgY7+yHFOhWHXV7cTL3Hg1LHFkc6gGBmFblFuVMFyXSIq+dCUoRwD8AlZit0dWEhtuRHGNk4vV46/QspGlL0aE5fk879ZPDZiSjMAcKXM6pXGtu+URCOevG9bAxhs6UrxDDR29L0OTtuQm8AV6CuDWZUSrHUrS8Dd2k= 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 17845584232271007.304706020274; Mon, 20 Jul 2026 07:40:23 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wlp7x-0003kz-3D; Mon, 20 Jul 2026 10:37:53 -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 1wlp3b-0001wV-CX for qemu-devel@nongnu.org; Mon, 20 Jul 2026 10:33:28 -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 1wlp3Y-0002ep-M9 for qemu-devel@nongnu.org; Mon, 20 Jul 2026 10:33:23 -0400 Received: from mx-prod-mc-01.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-626-0xd64KbZOi2HHd5484aI8w-1; Mon, 20 Jul 2026 10:33:13 -0400 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-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 326561923699; Mon, 20 Jul 2026 14:32:46 +0000 (UTC) Received: from sirius.home.kraxel.org (unknown [10.44.32.44]) by mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 8490D18001E7; Mon, 20 Jul 2026 14:32:45 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 6CE6A1800859; Mon, 20 Jul 2026 16:32:44 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1784557996; 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=RP5+nNGM6+o3ygW9g3JYvNR2ZhHgUHMqKGis77qBfrjxakrGsirHPERMpR1/P3+YfWmbkY gt3oDESHeAjyvUKwJo5+FOkaFKc/QLWxazR/6pyDhJxdd+ntLm1/6XymL/8yHB4Ik+rWrN YfBGWJYG47/07JkPIjh1DGHD7sY5QEE= X-MC-Unique: 0xd64KbZOi2HHd5484aI8w-1 X-Mimecast-MFC-AGG-ID: 0xd64KbZOi2HHd5484aI8w_1784557992 From: Gerd Hoffmann To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, mcascell@redhat.com, Gerd Hoffmann Subject: [PATCH v4 1/6] hw/uefi: add sanity check Date: Mon, 20 Jul 2026 16:32:37 +0200 Message-ID: <20260720143244.821889-2-kraxel@redhat.com> In-Reply-To: <20260720143244.821889-1-kraxel@redhat.com> References: <20260720143244.821889-1-kraxel@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=lists1p.gnu.org; Received-SPF: permerror client-ip=170.10.133.124; envelope-from=kraxel@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: 12 X-Spam_score: 1.2 X-Spam_bar: + X-Spam_report: (1.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, 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, RCVD_IN_SBL_CSS=3.335, SPF_HELO_PASS=-0.001, T_SPF_PERMERROR=0.01 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: 1784558423654158500 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 Acked-by: Luigi Leonardi --- 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 Sat Jul 25 11:02:42 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=1784558316; cv=none; d=zohomail.com; s=zohoarc; b=ZFWZFXw2XqZfhMkbgkvMfW7DrUNR4qbIuCROs+L31CIayKzWis+ZbXclOLqAUU9O4YmNQ6YwD+pGqoJyk0lRS0EGhyHmmKKEwYMlO2//6OczPyONcAQKzo9ttBg4j5sP0Lvb2OEk/BxVmI34+8rW6xslhFThFsQwzcq7lKj2X1c= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1784558316; 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=UGWHelquemiDD5NLCvYR1AkBolWYwsAixwbTYXmasbU=; b=L8hmjEbB1DfgQunVjPn1lY6OU8crgWYk0UVtvBKiTy77syPJfya8a8cWZJ4PJKqTq6cbU6468zFRrrTWSoaHK2v8MqDJLp0dylqDjgBmuxpUgQmRzYuBa/WDi+nmpmxuE4YbhmXCWhbH2dUo6YFtHIq/wO1N9eJIddlV0yenWGQ= 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 1784558316545676.4530551422944; Mon, 20 Jul 2026 07:38:36 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wlp86-0003y9-Ny; Mon, 20 Jul 2026 10:38: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 1wlp3b-0001wW-ID for qemu-devel@nongnu.org; Mon, 20 Jul 2026 10:33:28 -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 1wlp3Z-0002fR-Cm for qemu-devel@nongnu.org; Mon, 20 Jul 2026 10:33:23 -0400 Received: from mx-prod-mc-08.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-541-72NoIh1ZMPu3KNwuKuCErA-1; Mon, 20 Jul 2026 10:33:19 -0400 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-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 5C368187D359; Mon, 20 Jul 2026 14:32:47 +0000 (UTC) Received: from sirius.home.kraxel.org (unknown [10.44.32.44]) by mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 1BB5E18001E7; Mon, 20 Jul 2026 14:32:47 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 7D74A180086B; Mon, 20 Jul 2026 16:32:44 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1784558000; 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=UGWHelquemiDD5NLCvYR1AkBolWYwsAixwbTYXmasbU=; b=FflsmWnEx8g9nmZ+GrPzmDVZIYm8gpkgrxupO4GHCmo+6kwvsFU8Ulac79hDIldpcDQF3i frz/xqmu7d4XYptXQ6GHu3CW9TGFwYxN2C10UlzFYo5qS9WvJ7SXHUxbigbmPZ4NbsBGns XOapo51OX6XF/nrqFa7iSmqUShUUvPw= X-MC-Unique: 72NoIh1ZMPu3KNwuKuCErA-1 X-Mimecast-MFC-AGG-ID: 72NoIh1ZMPu3KNwuKuCErA_1784557998 From: Gerd Hoffmann To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, mcascell@redhat.com, Gerd Hoffmann Subject: [PATCH v4 2/6] hw/uefi: remove debug function Date: Mon, 20 Jul 2026 16:32:38 +0200 Message-ID: <20260720143244.821889-3-kraxel@redhat.com> In-Reply-To: <20260720143244.821889-1-kraxel@redhat.com> References: <20260720143244.821889-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.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=lists1p.gnu.org; Received-SPF: permerror client-ip=170.10.129.124; envelope-from=kraxel@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, 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_H2=-0.01, SPF_HELO_PASS=-0.001, T_SPF_PERMERROR=0.01 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: 1784558316990158500 This was never meant to be present 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. Remove the function. If needed for debugging the git log is your friend. Fixes: CVE-2026-58582 Resolves: https://gitlab.com/qemu-project/qemu/-/work_items/3615 Signed-off-by: Gerd Hoffmann Acked-by: Luigi Leonardi --- hw/uefi/var-service-policy.c | 32 -------------------------------- 1 file changed, 32 deletions(-) diff --git a/hw/uefi/var-service-policy.c b/hw/uefi/var-service-policy.c index 989bf87ddb86..0880bfe074a6 100644 --- a/hw/uefi/var-service-policy.c +++ b/hw/uefi/var-service-policy.c @@ -37,37 +37,6 @@ const VMStateDescription vmstate_uefi_var_policy =3D { }, }; =20 -static void print_policy_entry(variable_policy_entry *pe) -{ - uint16_t *name =3D (void *)pe + pe->offset_to_name; - - fprintf(stderr, "%s:\n", __func__); - - fprintf(stderr, " name =C2=B4"); - while (*name) { - fprintf(stderr, "%c", *name); - name++; - } - fprintf(stderr, "', version=3D%d.%d, size=3D%d\n", - pe->version >> 16, pe->version & 0xffff, pe->size); - - if (pe->min_size) { - fprintf(stderr, " size min=3D%d\n", pe->min_size); - } - if (pe->max_size !=3D UINT32_MAX) { - fprintf(stderr, " size max=3D%u\n", pe->max_size); - } - if (pe->attributes_must_have) { - fprintf(stderr, " attr must=3D0x%x\n", pe->attributes_must_have= ); - } - if (pe->attributes_cant_have) { - fprintf(stderr, " attr cant=3D0x%x\n", pe->attributes_cant_have= ); - } - if (pe->lock_policy_type) { - fprintf(stderr, " lock policy type %d\n", pe->lock_policy_type); - } -} - static gboolean wildcard_str_equal(uefi_var_policy *pol, uefi_variable *var) { @@ -173,7 +142,6 @@ 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); =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 From nobody Sat Jul 25 11:02:42 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=1784558328; cv=none; d=zohomail.com; s=zohoarc; b=DhGij4iTfgd+w9wTdDhvrK8oLVSF3mFO/VdT1Hyu9mTCCLm6V/3SnV6TRIyKMS+05SApna0J4qHlJdF6fBlg/AUAg7QbCJqtVdtZOqq7ubP7f4GYVZxgG0wTOmYqprTcJiEIuu0rIXXuQeT+1xf1fGx9eyWPl0EMhA+4/Gwqm9o= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1784558328; 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=hy2YLW/gLMo797VszhQ6PHzzCHyjlqdKcsagTuGlT/4=; b=lwEttr75P/2L+Y7SnOahFUzttVwZ8fnq4u7d3IKLKkmIW8c9+w3aQacXXyIkplZnif48vXslmpYgyyVjPe4V1kyZJhUtoJSU7368Xt4WS7mIwyGa9HX2uwPfH9ZSLPSyuJVlClxLx02SP/RhE+R4fALryPABKbZUPCm7QXGi70s= 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 1784558327908883.0290791693886; Mon, 20 Jul 2026 07:38:47 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wlp82-0003li-3R; Mon, 20 Jul 2026 10:37: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 1wlp3J-0001sp-1P for qemu-devel@nongnu.org; Mon, 20 Jul 2026 10:33:07 -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 1wlp3H-0002dx-Fn for qemu-devel@nongnu.org; Mon, 20 Jul 2026 10:33:04 -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-437-Y26WR_SdOKSmLBr7kUVdig-1; Mon, 20 Jul 2026 10:32:58 -0400 Received: from mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.4]) (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 AC9BA180A997; Mon, 20 Jul 2026 14:32:47 +0000 (UTC) Received: from sirius.home.kraxel.org (unknown [10.44.32.44]) by mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 3A1EF30001BE; Mon, 20 Jul 2026 14:32:47 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 8C6411800900; Mon, 20 Jul 2026 16:32:44 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1784557982; 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=hy2YLW/gLMo797VszhQ6PHzzCHyjlqdKcsagTuGlT/4=; b=Vl+ArHhcyJ0AU4K9S6rih9vs+/GE5BaS44MzFystrWOQkMc/mRfmQxNtEsnsidLe5QQn3s z5IPgNjzlj3zE0YS/ah9Q3tp6zIcUh+XRk62cdaLJ7MNyDfv6eK52bHkh9PrQtmUlpkm9w vjo7ujzp9PNSNMuTXE1GLtaKdDK9vA4= X-MC-Unique: Y26WR_SdOKSmLBr7kUVdig-1 X-Mimecast-MFC-AGG-ID: Y26WR_SdOKSmLBr7kUVdig_1784557977 From: Gerd Hoffmann To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, mcascell@redhat.com, Gerd Hoffmann Subject: [PATCH v4 3/6] hw/uefi: check lower limit for signature list size Date: Mon, 20 Jul 2026 16:32:39 +0200 Message-ID: <20260720143244.821889-4-kraxel@redhat.com> In-Reply-To: <20260720143244.821889-1-kraxel@redhat.com> References: <20260720143244.821889-1-kraxel@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.4 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: permerror client-ip=170.10.129.124; envelope-from=kraxel@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, 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_H2=-0.01, SPF_HELO_PASS=-0.001, T_SPF_PERMERROR=0.01 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: 1784558329058158500 Content-Type: text/plain; charset="utf-8" Specifically disallow zero which can lead to an endless loop. Fixes: CVE-2026-61406 Resolves: https://gitlab.com/qemu-project/qemu/-/work_items/3899 Signed-off-by: Gerd Hoffmann Acked-by: Luigi Leonardi --- hw/uefi/var-service-siglist.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/hw/uefi/var-service-siglist.c b/hw/uefi/var-service-siglist.c index 8948f1b78471..9e03a4dc0c28 100644 --- a/hw/uefi/var-service-siglist.c +++ b/hw/uefi/var-service-siglist.c @@ -94,6 +94,9 @@ void uefi_vars_siglist_parse(uefi_vars_siglist *siglist, break; } efilist =3D data; + if (efilist->siglist_size < sizeof(*efilist)) { + break; + } if (size < efilist->siglist_size) { break; } --=20 2.55.0 From nobody Sat Jul 25 11:02:42 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=1784558279; cv=none; d=zohomail.com; s=zohoarc; b=cvZ6s24ZMHegUIotBfL5Gu+V/vJIbYJiagE4gBzcnNx+sknbO7MDrQD4WtBlaMHkTFnN9uf0wPnPlYjEuxJY0Rf0DnkhMRPR2SXsl3yu6Wvu6l+eiu9Q+Wdbc7gSKUUXB7GZlYA3oYrK/B+1jbKgvbcV78iNtuVubX+BMpqSgwU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1784558279; 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=sTmzTu2GwNp8kx7ZebrgoU+qGZvdlx+WqTNJKCvwnSY=; b=mdSDHi2O+2r0rfhPnMirAONWWEqaNCg2diWj68jHfAyciQOq147XsBXMjLptXn9KwxJ7qWxNe0UPiMnlZo5nXDfikL8uXNi3151D8Uuguposj36HwE/ssix9jSZ62d0Y3po9EvSmhmdgLKy3f1pueY6krAtWBB/clvhaZDTaQUQ= 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 1784558279263539.0995790328333; Mon, 20 Jul 2026 07:37:59 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wlp7p-0003fV-Ng; Mon, 20 Jul 2026 10:37:45 -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 1wlp3H-0001sW-FA for qemu-devel@nongnu.org; Mon, 20 Jul 2026 10:33:06 -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 1wlp3F-0002dh-Rc for qemu-devel@nongnu.org; Mon, 20 Jul 2026 10:33:03 -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-495-RKRn7v48Ozaxl3JQbL13tg-1; Mon, 20 Jul 2026 10:32:58 -0400 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-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 5A76F1808997; Mon, 20 Jul 2026 14:32:48 +0000 (UTC) Received: from sirius.home.kraxel.org (unknown [10.44.32.44]) by mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id F29B818001E7; Mon, 20 Jul 2026 14:32:47 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id A1FE218009D6; Mon, 20 Jul 2026 16:32:44 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1784557980; 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=sTmzTu2GwNp8kx7ZebrgoU+qGZvdlx+WqTNJKCvwnSY=; b=I7jgxbjs803tW/eI99eLswr7IwCv0Ux2pGZUmDg4e2A3vv68+Zd3qwjrAvVlnZ773FWPDh 8FPh82ZH2lu6I4SE1A1M/2XTQi2d01LZvBiTIW2pf5APZHKladn1mf3kMhiDblrLFaRLfs AgUYb/DZafWRvi13XaAjDjxPVt5tXpw= X-MC-Unique: RKRn7v48Ozaxl3JQbL13tg-1 X-Mimecast-MFC-AGG-ID: RKRn7v48Ozaxl3JQbL13tg_1784557978 From: Gerd Hoffmann To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, mcascell@redhat.com, Gerd Hoffmann Subject: [PATCH v4 4/6] hw/uefi: account variable policy entries against storage size Date: Mon, 20 Jul 2026 16:32:40 +0200 Message-ID: <20260720143244.821889-5-kraxel@redhat.com> In-Reply-To: <20260720143244.821889-1-kraxel@redhat.com> References: <20260720143244.821889-1-kraxel@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=lists1p.gnu.org; Received-SPF: permerror client-ip=170.10.129.124; envelope-from=kraxel@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, 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_H2=-0.01, SPF_HELO_PASS=-0.001, T_SPF_PERMERROR=0.01 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: 1784558281086158500 Content-Type: text/plain; charset="utf-8" uefi-vars already tracks (and limits) the memory footprint of UEFI variables. Do that for variable policies too. Fixes: CVE-2026-61405 Resolves: https://gitlab.com/qemu-project/qemu/-/work_items/3890 Signed-off-by: Gerd Hoffmann Acked-by: Luigi Leonardi --- hw/uefi/var-service-policy.c | 5 +++++ hw/uefi/var-service-vars.c | 4 ++++ 2 files changed, 9 insertions(+) diff --git a/hw/uefi/var-service-policy.c b/hw/uefi/var-service-policy.c index 0880bfe074a6..46c4ff2dacae 100644 --- a/hw/uefi/var-service-policy.c +++ b/hw/uefi/var-service-policy.c @@ -283,7 +283,12 @@ static uint32_t uefi_vars_mm_check_policy_register(uef= i_vars_state *uv, return uefi_vars_mm_policy_error(mhdr, mchk, EFI_ALREADY_STARTED); } =20 + if (uv->used_storage + pe->size > uv->max_storage) { + return uefi_vars_mm_policy_error(mhdr, mchk, EFI_OUT_OF_RESOURCES); + } + uefi_vars_add_policy(uv, pe); + uv->used_storage +=3D pe->size; =20 mchk->result =3D EFI_SUCCESS; return sizeof(*mchk); diff --git a/hw/uefi/var-service-vars.c b/hw/uefi/var-service-vars.c index 2c83130ebf63..fd07782f1e0d 100644 --- a/hw/uefi/var-service-vars.c +++ b/hw/uefi/var-service-vars.c @@ -201,11 +201,15 @@ void uefi_vars_clear_all(uefi_vars_state *uv) void uefi_vars_update_storage(uefi_vars_state *uv) { uefi_variable *var; + uefi_var_policy *pol; =20 uv->used_storage =3D 0; QTAILQ_FOREACH(var, &uv->variables, next) { uv->used_storage +=3D variable_size(var); } + QTAILQ_FOREACH(pol, &uv->var_policies, next) { + uv->used_storage +=3D pol->entry->size; + } } =20 static gboolean check_access(uefi_vars_state *uv, uefi_variable *var) --=20 2.55.0 From nobody Sat Jul 25 11:02:42 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=1784558286; cv=none; d=zohomail.com; s=zohoarc; b=Bmuw+nw2A3bvZKVnDHzUWe+jkvrMWwGAHmlAyr8lN+y6BUxPrQ9E0oZhvrNyzxDLeZhkNSu81r6PBr2XLobE1L+QT2nDYUSwMRjUEwG8o8rJieMlvPE1i+qavdOJQj6IijWULpYtCVkoLv+GzPT60mTEkbX1d3B95p7S+QZv6xM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1784558286; 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=isIDgk8fh9L6wGuUTe/kzD1Ff1lEXr4zRrj3k54zv5Q=; b=byziC0TDnSDolOCnODC3vhje5fdjvaNihSauIcf4bqDsmHDU/8SABvyTCgo0XBq4OWSRp55vrIUOnzqhqW/moIlxd3cMMdtZkIRv9W3q0PfyEv3aidCqmZP0mBM8MlTgUsdEG9XbJ6p6U+Chj7T4/bS4NW96zXAo3jdnVHwP/L4= 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 1784558286216204.96870012274974; Mon, 20 Jul 2026 07:38:06 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wlp7q-0003gR-Tu; Mon, 20 Jul 2026 10:37:46 -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 1wlp3I-0001sl-V6 for qemu-devel@nongnu.org; Mon, 20 Jul 2026 10:33:07 -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 1wlp3F-0002dg-R9 for qemu-devel@nongnu.org; Mon, 20 Jul 2026 10:33:03 -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-252-STQNngFCMGqeYjCkWNlMEA-1; Mon, 20 Jul 2026 10:32:56 -0400 Received: from mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.4]) (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 6B8DD1977032; Mon, 20 Jul 2026 14:32:48 +0000 (UTC) Received: from sirius.home.kraxel.org (unknown [10.44.32.44]) by mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 2894E30001BE; Mon, 20 Jul 2026 14:32:48 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id B856918009D8; Mon, 20 Jul 2026 16:32:44 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1784557980; 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=isIDgk8fh9L6wGuUTe/kzD1Ff1lEXr4zRrj3k54zv5Q=; b=ILwvj5Rnkfh7Yt25wU0TJLM/5lmDtrKrZJQ7yuztz4QukOg9j/JpaKjj8XniNPnyLBzvWE o7mm8SKv6QeDfQ0ujbTkwFu7Pr/ioUskp71juH4qdBC0DQOJx+rYkoHJbIErM+NMR1Xe8A 7DG8HwY8nxe4joaDuoCZ+3qhRwXUdok= X-MC-Unique: STQNngFCMGqeYjCkWNlMEA-1 X-Mimecast-MFC-AGG-ID: STQNngFCMGqeYjCkWNlMEA_1784557975 From: Gerd Hoffmann To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, mcascell@redhat.com, Gerd Hoffmann Subject: [PATCH v4 5/6] hw/uefi: add post_load checks Date: Mon, 20 Jul 2026 16:32:41 +0200 Message-ID: <20260720143244.821889-6-kraxel@redhat.com> In-Reply-To: <20260720143244.821889-1-kraxel@redhat.com> References: <20260720143244.821889-1-kraxel@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.4 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: permerror client-ip=170.10.133.124; envelope-from=kraxel@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: 12 X-Spam_score: 1.2 X-Spam_bar: + X-Spam_report: (1.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, 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, RCVD_IN_SBL_CSS=3.335, SPF_HELO_PASS=-0.001, T_SPF_PERMERROR=0.01 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: 1784558286986158500 Content-Type: text/plain; charset="utf-8" Add sanity checks to uefi-vars state loaded from live migration data stream. Fail migration if invalid data or inconsistencies are found. Fixes: CVE-2026-61404 Resolves: https://gitlab.com/qemu-project/qemu/-/work_items/3837 Resolves: https://gitlab.com/qemu-project/qemu/-/work_items/3838 Resolves: https://gitlab.com/qemu-project/qemu/-/work_items/3839 Resolves: https://gitlab.com/qemu-project/qemu/-/work_items/3885 Signed-off-by: Gerd Hoffmann Acked-by: Luigi Leonardi --- hw/uefi/var-service-core.c | 14 +++++++++++++- hw/uefi/var-service-json.c | 5 +++++ hw/uefi/var-service-policy.c | 28 +++++++++++++++++++++++----- hw/uefi/var-service-vars.c | 15 +++++++++++++++ 4 files changed, 56 insertions(+), 6 deletions(-) diff --git a/hw/uefi/var-service-core.c b/hw/uefi/var-service-core.c index 828d76007318..65da71029a60 100644 --- a/hw/uefi/var-service-core.c +++ b/hw/uefi/var-service-core.c @@ -5,6 +5,7 @@ */ #include "qemu/osdep.h" #include "qemu/crc32c.h" +#include "qemu/error-report.h" #include "system/dma.h" #include "migration/vmstate.h" =20 @@ -28,9 +29,20 @@ static int uefi_vars_post_load(void *opaque, int version= _id) { uefi_vars_state *uv =3D opaque; =20 + if (uv->buf_size > MAX_BUFFER_SIZE) { + error_report("invalid buffer size"); + return -1; + } + uv->buffer =3D g_malloc(uv->buf_size); + uefi_vars_update_storage(uv); + if (uv->used_storage > uv->max_storage) { + error_report("out of variable memory (%" PRId64 " > %" PRId64 ")", + uv->used_storage, uv->max_storage); + return -1; + } + uefi_vars_json_save(uv); - uv->buffer =3D g_malloc(uv->buf_size); return 0; } =20 diff --git a/hw/uefi/var-service-json.c b/hw/uefi/var-service-json.c index 8621b86c5c5f..f90deef79b76 100644 --- a/hw/uefi/var-service-json.c +++ b/hw/uefi/var-service-json.c @@ -18,6 +18,7 @@ #include "qobject/qobject.h" #include "qobject/qjson.h" =20 +#include "qapi/error.h" #include "qapi/dealloc-visitor.h" #include "qapi/qobject-input-visitor.h" #include "qapi/qobject-output-visitor.h" @@ -249,6 +250,10 @@ void uefi_vars_json_load(uefi_vars_state *uv, Error **= errp) if (!(*errp)) { uefi_vars_from_qapi(uv, vs); uefi_vars_update_storage(uv); + if (uv->used_storage > uv->max_storage) { + error_setg(errp, "out of variable memory (%ld > %ld)", + uv->used_storage, uv->max_storage); + } } =20 qapi_free_UefiVarStore(vs); diff --git a/hw/uefi/var-service-policy.c b/hw/uefi/var-service-policy.c index 46c4ff2dacae..d43cc9b2500b 100644 --- a/hw/uefi/var-service-policy.c +++ b/hw/uefi/var-service-policy.c @@ -7,6 +7,7 @@ * https://github.com/tianocore/edk2/blob/master/MdeModulePkg/Library/Vari= ablePolicyLib/ReadMe.md */ #include "qemu/osdep.h" +#include "qemu/error-report.h" #include "system/dma.h" #include "migration/vmstate.h" =20 @@ -16,14 +17,18 @@ =20 #include "trace.h" =20 -static void calc_policy(uefi_var_policy *pol); +static int check_calc_policy(uefi_var_policy *pol); =20 static int uefi_var_policy_post_load(void *opaque, int version_id) { uefi_var_policy *pol =3D opaque; + int rc; =20 - calc_policy(pol); - return 0; + rc =3D check_calc_policy(pol); + if (rc !=3D 0) { + error_report("invalid uefi variable policy"); + } + return rc; } =20 const VMStateDescription vmstate_uefi_var_policy =3D { @@ -80,32 +85,45 @@ static uefi_var_policy *wildcard_find_policy(uefi_vars_= state *uv, return NULL; } =20 -static void calc_policy(uefi_var_policy *pol) +static int check_calc_policy(uefi_var_policy *pol) { variable_policy_entry *pe =3D pol->entry; unsigned int i; =20 + if (pol->entry_size !=3D pe->size || + pe->offset_to_name >=3D pe->size) { + return -1; + } + pol->name =3D (void *)pol->entry + pe->offset_to_name; pol->name_size =3D pe->size - pe->offset_to_name; =20 + if (!uefi_str_is_valid(pol->name, pol->name_size, false)) { + return -1; + } + for (i =3D 0; i < pol->name_size / 2; i++) { if (pol->name[i] =3D=3D '#') { pol->hashmarks++; } } + + return 0; } =20 uefi_var_policy *uefi_vars_add_policy(uefi_vars_state *uv, variable_policy_entry *pe) { uefi_var_policy *pol, *p; + int rc; =20 pol =3D g_new0(uefi_var_policy, 1); pol->entry =3D g_malloc(pe->size); memcpy(pol->entry, pe, pe->size); pol->entry_size =3D pe->size; =20 - calc_policy(pol); + rc =3D check_calc_policy(pol); + g_assert(rc =3D=3D 0); =20 /* keep list sorted by priority, add to tail of priority group */ QTAILQ_FOREACH(p, &uv->var_policies, next) { diff --git a/hw/uefi/var-service-vars.c b/hw/uefi/var-service-vars.c index fd07782f1e0d..e0ea3d532eb6 100644 --- a/hw/uefi/var-service-vars.c +++ b/hw/uefi/var-service-vars.c @@ -47,6 +47,20 @@ static int uefi_vars_pre_load(void *opaque) return 0; } =20 +static int uefi_vars_post_load(void *opaque, int version_id) +{ + uefi_variable *var =3D opaque; + + if (!uefi_str_is_valid(var->name, var->name_size, true) || + var->attributes & ~EFI_VARIABLE_ATTRIBUTE_SUPPORTED || + (var->digest_size !=3D 0 && + var->digest_size !=3D 32 /* AUTHVAR_DIGEST_SIZE */)) { + error_report("invalid uefi variable"); + return -1; + } + return 0; +} + static bool uefi_vars_digest_is_needed(void *opaque) { uefi_variable *var =3D opaque; @@ -72,6 +86,7 @@ const VMStateDescription vmstate_uefi_variable_digest =3D= { const VMStateDescription vmstate_uefi_variable =3D { .name =3D "uefi-variable", .pre_load =3D uefi_vars_pre_load, + .post_load =3D uefi_vars_post_load, .fields =3D (VMStateField[]) { VMSTATE_UINT8_ARRAY_V(guid.data, uefi_variable, sizeof(QemuUUID), = 0), VMSTATE_UINT32(name_size, uefi_variable), --=20 2.55.0 From nobody Sat Jul 25 11:02:42 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=1784558316; cv=none; d=zohomail.com; s=zohoarc; b=ZLdefwyjd1ftREU6Q0LvprQ6dunfSbpBI1S5t6kzMia7uIhCRfm/ohxiUcsQXR7N6nkejg/MOhAhdCQfTilzRQyrbDWRo528uRHaYxngAwuNd+evbZiISlLQeb37zBm6BEVzrNkPyESgGHveEvisMOsor7WniNDBH3WeqWoQ/Hw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1784558316; 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=vfEdRmaMkSpKwMtbPSoO+WSQgFQrIV9zs17TE8mNgDc=; b=eVIbj3g1Y+c5d3U1bdXtL9FhkVmmGUFWH/kQx5ymYN29EJnjEhiJwH+w/muv+xuLk6tSgtXMWGjH7hyzPDeufiwcXd9FV7DjDJK+526GyxxUvWWWe7whN1clGMUMpZEHhGpwR3QRV/JdSkJ5dr88oGTrozPqa9jS1Q9/oG4HyYY= 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 1784558316221197.44161997858396; Mon, 20 Jul 2026 07:38:36 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wlp87-0004BQ-S0; Mon, 20 Jul 2026 10:38:03 -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 1wlp3I-0001sm-VA for qemu-devel@nongnu.org; Mon, 20 Jul 2026 10:33:07 -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 1wlp3G-0002dt-Dk for qemu-devel@nongnu.org; Mon, 20 Jul 2026 10:33:04 -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-590-5emxf-60MoKP59uePYslNw-1; Mon, 20 Jul 2026 10:33:00 -0400 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-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 173DD180ABF8; Mon, 20 Jul 2026 14:32:49 +0000 (UTC) Received: from sirius.home.kraxel.org (unknown [10.44.32.44]) by mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id CA92E18001E7; Mon, 20 Jul 2026 14:32:48 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id C6DEB18009E1; Mon, 20 Jul 2026 16:32:44 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1784557981; 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=vfEdRmaMkSpKwMtbPSoO+WSQgFQrIV9zs17TE8mNgDc=; b=aJqMICdg+aHlJ6aDcT+CfGa1Gz+MzyUTt2FDYWVtxkQd5bR/RyGJbtqSG15PHxFO7ELzG3 sske9sYkObbXUg/rnwlYCeJL6bKOF3FclPfFnWu0zQ6C/BsF46g/q9gO8e+rXcu5jIrzaZ VqAy3q/mRH/CQu1ot0f3dERL3XWqjIo= X-MC-Unique: 5emxf-60MoKP59uePYslNw-1 X-Mimecast-MFC-AGG-ID: 5emxf-60MoKP59uePYslNw_1784557978 From: Gerd Hoffmann To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, mcascell@redhat.com, Gerd Hoffmann Subject: [PATCH v4 6/6] hw/uefi: make SetupMode read-only Date: Mon, 20 Jul 2026 16:32:42 +0200 Message-ID: <20260720143244.821889-7-kraxel@redhat.com> In-Reply-To: <20260720143244.821889-1-kraxel@redhat.com> References: <20260720143244.821889-1-kraxel@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=lists1p.gnu.org; Received-SPF: permerror client-ip=170.10.133.124; envelope-from=kraxel@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, 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_PASS=-0.001, T_SPF_PERMERROR=0.01 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: 1784558319148158501 Content-Type: text/plain; charset="utf-8" This is read-only variable which informs the OS about the secure boot state. Reject any attempts to write to it. Fixes: CVE-2026-16288 Resolves: https://gitlab.com/qemu-project/qemu/-/work_items/4039 Signed-off-by: Gerd Hoffmann Acked-by: Luigi Leonardi --- hw/uefi/var-service-auth.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/hw/uefi/var-service-auth.c b/hw/uefi/var-service-auth.c index f3dc9c6ca608..899444af12df 100644 --- a/hw/uefi/var-service-auth.c +++ b/hw/uefi/var-service-auth.c @@ -298,6 +298,13 @@ efi_status uefi_vars_check_secure_boot(uefi_vars_state= *uv, uefi_variable *var) return EFI_WRITE_PROTECTED; } =20 + /* reject SetupMode updates */ + if (qemu_uuid_is_equal(&var->guid, &EfiGlobalVariable) && + uefi_str_equal(var->name, var->name_size, + name_setup_mode, sizeof(name_setup_mode))) { + return EFI_WRITE_PROTECTED; + } + return EFI_SUCCESS; } =20 --=20 2.55.0