From nobody Sun Jul 26 10:07:52 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=1783593804; cv=none; d=zohomail.com; s=zohoarc; b=inFt9Y/+lT9mKMYdglQJ6K2wjgf/Zm/lkangLDUK3rd3BZM0x7OPQJUQonPx4LKUOjIqx3BPSpd5SeG56xaftMBYJxiM34jYbs+qHrB/DNwAq42wqt5yhgh+Iz544gl91bhZkbBjLGt2dIWo7ZI6gAJhcIcHO9cbI7H6eOXDpyo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1783593804; 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=CSU1xqNMNzLfnpfijrv3PYlLKxbYeiCCzrVVQd6m2/fwDzRSv64+tSIShY8bW+dJfIQj53AVThB1A7/SyIlWuQlwfOcPz9Gl9U97tR0c7dsqwoBpP7kRYi9osRNbDiQh+fVwa8vYACZNDFkDosSezxKvCskf3dbod7qBrzJXKZc= 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 178359380407422.369005124154228; Thu, 9 Jul 2026 03:43:24 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1whmDB-0004Vj-Fw; Thu, 09 Jul 2026 06:42:33 -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 1whmD9-0004V5-J4 for qemu-devel@nongnu.org; Thu, 09 Jul 2026 06:42:31 -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 1whmD8-0001Xk-3Y for qemu-devel@nongnu.org; Thu, 09 Jul 2026 06:42:31 -0400 Received: from mx-prod-mc-03.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-553-qGzllNhgPESj9WtKG-txbQ-1; Thu, 09 Jul 2026 06:42:26 -0400 Received: from mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.111]) (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-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 0CB2A1955DDF; Thu, 9 Jul 2026 10:42:25 +0000 (UTC) Received: from sirius.home.kraxel.org (unknown [10.44.32.140]) by mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 5A4EE1800591; Thu, 9 Jul 2026 10:42:24 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 32DA21801010; Thu, 09 Jul 2026 12:42:23 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1783593749; 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=OB6OuA4xDnQ+zn4ErL2mHLYTygOBJVPdnZwJl/bxg1Ybh63Ou6maVY17oftV0/xMp3ScWV h/RqKFjgxM/0lfPoXZpim+h0WWLYovLI6WRZ0KXEavbOip+xBr2Ykcsfa7nUS1RzEU3BfZ tlIghC8V3Z8QGvBk6t+2bWPlbJdwwIA= X-MC-Unique: qGzllNhgPESj9WtKG-txbQ-1 X-Mimecast-MFC-AGG-ID: qGzllNhgPESj9WtKG-txbQ_1783593745 From: Gerd Hoffmann To: qemu-devel@nongnu.org Cc: mcascell@redhat.com, Gerd Hoffmann , peter.maydell@linaro.org Subject: [PATCH v3 1/5] hw/uefi: add sanity check Date: Thu, 9 Jul 2026 12:42:16 +0200 Message-ID: <20260709104223.143594-2-kraxel@redhat.com> In-Reply-To: <20260709104223.143594-1-kraxel@redhat.com> References: <20260709104223.143594-1-kraxel@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.111 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: 1783593805836158500 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 10:07:52 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=1783593795; cv=none; d=zohomail.com; s=zohoarc; b=lUcCU5zK2MrPPC0XLhqvvS/Fjp4XGSUtYypneiCjpN1qwbc05rf8DG/vfd0xp08/y1t8e9pY7fzNVRUDlogMda84c1y+Z9uOqWkCWmCIa+Jq80fLsxGENtQSfLP7ujxPoXJlXfVKuAtOkvoQBv4+OYqTog1eBRdJiiXptc1tfUU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1783593795; 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=lDurdBcSlsH0KTOZOxMxYnRapp0OOF01fa/yqNzbT9D4390KT1EFPLMqlLd6YgjPPYYbygYbDCp4Jxg4PbvZbiOKBkzU2sptevUDK/mZqw+m3qmSRulXz2SlQ/pVoIOQ6Rw+27Ox2OD7NXD/Sht/0VdSi3pm/lha4LvXF7yLLtw= 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 1783593795588350.48661816152935; Thu, 9 Jul 2026 03:43:15 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1whmDB-0004W8-W4; Thu, 09 Jul 2026 06:42:34 -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 1whmDA-0004VK-RC for qemu-devel@nongnu.org; Thu, 09 Jul 2026 06:42:32 -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 1whmD9-0001Y0-5P for qemu-devel@nongnu.org; Thu, 09 Jul 2026 06:42:32 -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-557-R0OpMHJQMgm6kcaZ1oingQ-1; Thu, 09 Jul 2026 06:42:27 -0400 Received: from mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.17]) (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 7495819560BB; Thu, 9 Jul 2026 10:42:26 +0000 (UTC) Received: from sirius.home.kraxel.org (unknown [10.44.32.140]) by mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 028181955D71; Thu, 9 Jul 2026 10:42:26 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 426371801013; Thu, 09 Jul 2026 12:42:23 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1783593750; 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=IYSp2WsdkAMl6bxzTa6cPgGWHBunsvqzZOBhq9NjrrRXuoA4hcS87ztaiynUn9iHCHIpqJ Cb0Heg6WZ2FrI3Z6IoTVpFYWOCLUDHY4fiki6jBi61wnRPlpd8yN7SFdpjkhPsT9mrni3M PoYIt4g+2w8oEMvNNS15rTRxMRSdz0Q= X-MC-Unique: R0OpMHJQMgm6kcaZ1oingQ-1 X-Mimecast-MFC-AGG-ID: R0OpMHJQMgm6kcaZ1oingQ_1783593746 From: Gerd Hoffmann To: qemu-devel@nongnu.org Cc: mcascell@redhat.com, Gerd Hoffmann , peter.maydell@linaro.org Subject: [PATCH v3 2/5] hw/uefi: remove debug function Date: Thu, 9 Jul 2026 12:42:17 +0200 Message-ID: <20260709104223.143594-3-kraxel@redhat.com> In-Reply-To: <20260709104223.143594-1-kraxel@redhat.com> References: <20260709104223.143594-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.0 on 10.30.177.17 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: 1783593798557158500 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 --- 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 Sun Jul 26 10:07:52 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=1783593840; cv=none; d=zohomail.com; s=zohoarc; b=ANnF3TK/mUNsV+9VgoI3Og7iTNRNgDlJ/DmMKaM0QudUjigE9aJJ6DPe0rZqIJTKBpvvyR5C9rDMH6v+dADCrzjivs+F9CVS3sSXugsGVedpO5I7b+EvaFzPrXMeEgazuMUkcfzCiBwFKThOTIf42Jm6z7Jk4vw0gYzcUnma+fc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1783593840; 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=JdchScf8ZRnYqfg5VDHn7t8Kfl5CaET81xnYLFIy4kTYtDtoFpIqxybSXL65b0bOmUPYGZA9iIPpgZoa6YsuLIrWY5P8Kwe0QueMvxiqSULpp/8tx9rwfL3E/HxCK7w2Gn7DM0SvahvCsj3tJfjKJlnvfpzd5xg9CiLGllgU0X0= 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 1783593840274141.3911659755655; Thu, 9 Jul 2026 03:44:00 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1whmDD-0004WY-MC; Thu, 09 Jul 2026 06:42:35 -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 1whmDB-0004Vb-2i for qemu-devel@nongnu.org; Thu, 09 Jul 2026 06:42:33 -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 1whmD9-0001Y6-Lg for qemu-devel@nongnu.org; Thu, 09 Jul 2026 06:42:32 -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-250-irbR4CAXMZi5xb80xHBtjg-1; Thu, 09 Jul 2026 06:42:27 -0400 Received: from mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.17]) (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 74C671800609; Thu, 9 Jul 2026 10:42:26 +0000 (UTC) Received: from sirius.home.kraxel.org (unknown [10.44.32.140]) by mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 1E89A195419E; Thu, 9 Jul 2026 10:42:26 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 50FF8180101C; Thu, 09 Jul 2026 12:42:23 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1783593750; 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=JDlWvavCOYfnqqi0ScUROjfcNpXOVrbd3TJj19RPHDRa8FrVk6mKlzfUEmvPSKmyTG3Egj qVJegsjphk6P8i2A/AQu7tkYJZs9TitE3QNaolD+OczrcniusUYGqcd2+BaVRxhLHY4fqU 5Nj7HJXlIhOhVkVEz81OD7UryWsxMW4= X-MC-Unique: irbR4CAXMZi5xb80xHBtjg-1 X-Mimecast-MFC-AGG-ID: irbR4CAXMZi5xb80xHBtjg_1783593746 From: Gerd Hoffmann To: qemu-devel@nongnu.org Cc: mcascell@redhat.com, Gerd Hoffmann , peter.maydell@linaro.org Subject: [PATCH v3 3/5] hw/uefi: check lower limit for signature list size Date: Thu, 9 Jul 2026 12:42:18 +0200 Message-ID: <20260709104223.143594-4-kraxel@redhat.com> In-Reply-To: <20260709104223.143594-1-kraxel@redhat.com> References: <20260709104223.143594-1-kraxel@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.0 on 10.30.177.17 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: 1783593842000158500 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 --- 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 Sun Jul 26 10:07:52 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=1783593809; cv=none; d=zohomail.com; s=zohoarc; b=DtRu2pXOxkLZZIlLyRn+Sw5N10PPQfU47/fHG2nnPTovU2FECz98raaDfwyxVUDqt7DUJ5vNdWkpxDTfo/726ML9fqQ09d7PIRPrbk9cXfHeo3aPt6W8qR2W8Rqnnxmvoxfm3AfgwKKw9ZZcPCiZDTI7WrRicUqw8BZO5Uc85wE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1783593809; 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=I9v00ZBm4wKJMoJM0RkSNYLhvRApTgeSqpTRgH68NrNp9B0fT22SAFVX6Ug1sP1ZZqrxyE5a2XnhL2mTN/YhTP1CqyHKSxBfM3w9dKLmUu3n6ySjzy2ak/9uWzU1sMQ/XvBOu99B7ZPXX3gr9VhDlY96OHUqYgPkQSgMEo287uU= 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 1783593809197526.904396372562; Thu, 9 Jul 2026 03:43:29 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1whmDC-0004W9-75; Thu, 09 Jul 2026 06:42:34 -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 1whmDA-0004VI-N4 for qemu-devel@nongnu.org; Thu, 09 Jul 2026 06:42:32 -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 1whmD8-0001Xt-Lk for qemu-devel@nongnu.org; Thu, 09 Jul 2026 06:42:32 -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-659-Oq-2Le-PMLeC5-WiS2HwvA-1; Thu, 09 Jul 2026 06:42:28 -0400 Received: from mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.17]) (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 7F8BD195607D; Thu, 9 Jul 2026 10:42:27 +0000 (UTC) Received: from sirius.home.kraxel.org (unknown [10.44.32.140]) by mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 16FD2195419E; Thu, 9 Jul 2026 10:42:27 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 622ED180101D; Thu, 09 Jul 2026 12:42:23 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1783593749; 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=CwxgUAEJaMdotSvhlEe2ZxQMp6V2bGlTEonFrScOnlgHxunev97MsyyGd/69dAHt8tYTXC 81Nygtqqb7GaWgIAcubrw0dxc7FcNBQ4OEj0xS1isVCKsoCz/S5EsPpvybHO1pOaqUkzh0 Z/OPwA8uux51hDdVeeg9eJGMNI3YzX8= X-MC-Unique: Oq-2Le-PMLeC5-WiS2HwvA-1 X-Mimecast-MFC-AGG-ID: Oq-2Le-PMLeC5-WiS2HwvA_1783593747 From: Gerd Hoffmann To: qemu-devel@nongnu.org Cc: mcascell@redhat.com, Gerd Hoffmann , peter.maydell@linaro.org Subject: [PATCH v3 4/5] hw/uefi: account variable policy entries against storage size Date: Thu, 9 Jul 2026 12:42:19 +0200 Message-ID: <20260709104223.143594-5-kraxel@redhat.com> In-Reply-To: <20260709104223.143594-1-kraxel@redhat.com> References: <20260709104223.143594-1-kraxel@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.0 on 10.30.177.17 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: 1783593809850158500 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 --- 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 Sun Jul 26 10:07:52 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=1783593804; cv=none; d=zohomail.com; s=zohoarc; b=YARzH54xLXdUfxbUGOjfE8/mUl0Yf+InzgLFTZNJT0D+U6F9u6cRHIEfQGj/UZuZi8Mb/lZIBE1Hul4RUABd965aJwa9T72Ft09YNyTuNJOog76SdozZ/BjwNWGrX8akVs5bYy3oabsfRL3AaZWwswN3atGYgiW+/GipXUnlOU4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1783593804; 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=zWrKNQIrI5+gpJz2mocl5DDthMqXLjcl18XUsgDp394=; b=BUkfGGBbBIzpEWHVqAjTo4+cGtX5JBXUhnK6Gz1I9jsEUwZ5LPl43iTrhQSVxNoPiI7ruzSA3kZXu5cRmJc19Ucl5h8HTpl1vKqnUEeABTNmj9/ZaGYKs7WivJWaqBAcUuOcheJakp0TSqIdhzdLMS3lFMncNY74HmlCBuOsizc= 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 1783593804073957.397849265442; Thu, 9 Jul 2026 03:43:24 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1whmDC-0004WD-FC; Thu, 09 Jul 2026 06:42:34 -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 1whmDA-0004VL-Rh for qemu-devel@nongnu.org; Thu, 09 Jul 2026 06:42:32 -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 1whmD8-0001Xm-70 for qemu-devel@nongnu.org; Thu, 09 Jul 2026 06:42:32 -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-649-m4AfKSxaNA6-yK7cG5yA5g-1; Thu, 09 Jul 2026 06:42:28 -0400 Received: from mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.17]) (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 5A074195605B; Thu, 9 Jul 2026 10:42:27 +0000 (UTC) Received: from sirius.home.kraxel.org (unknown [10.44.32.140]) by mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 16FF2195419F; Thu, 9 Jul 2026 10:42:27 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 786851801027; Thu, 09 Jul 2026 12:42:23 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1783593749; 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=zWrKNQIrI5+gpJz2mocl5DDthMqXLjcl18XUsgDp394=; b=a09GCAumS3yX8iO4aa8LO7UZEoeaz62MMoUoTFpV+DNOk0n7N2yTPmV1r3qHP1DWjuzL6i tx0VcYutzjNeO3se7f2Q30vL1c1I8p6pQRXMT4vUbjXyau1e2SqdrqVtdxbNk+0r727wJK eIob6psg10bg7WMWh8FXslX/HI1ZH8k= X-MC-Unique: m4AfKSxaNA6-yK7cG5yA5g-1 X-Mimecast-MFC-AGG-ID: m4AfKSxaNA6-yK7cG5yA5g_1783593747 From: Gerd Hoffmann To: qemu-devel@nongnu.org Cc: mcascell@redhat.com, Gerd Hoffmann , peter.maydell@linaro.org Subject: [PATCH v3 5/5] hw/uefi: add post_load checks Date: Thu, 9 Jul 2026 12:42:20 +0200 Message-ID: <20260709104223.143594-6-kraxel@redhat.com> In-Reply-To: <20260709104223.143594-1-kraxel@redhat.com> References: <20260709104223.143594-1-kraxel@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.0 on 10.30.177.17 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: 1783593805824158500 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 --- 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..acecf7a8a9b1 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 (%ld > %ld)", + 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