From nobody Fri Jan 9 09:10:22 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) client-ip=8.43.85.245; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Received-SPF: pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) client-ip=8.43.85.245; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=pass(p=reject dis=none) header.from=lists.libvirt.org ARC-Seal: i=1; a=rsa-sha256; t=1766965631; cv=none; d=zohomail.com; s=zohoarc; b=OLFGEIqq9szHQ/96sksW4ssRIdA2tHtU2c2rgbpQq47MZc8BUJ+U+Oq2UQhMcS5h2H/TPROg2ErmJILP5YgCgyR+M68MNRk652SdyllPvUlki2mhpFHgXl81gmmEC/Zp08/OLS1SuNHWQB9CnmSpyvjhtAfV0sL/bpNItiNyqnY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1766965631; h=Content-Type:Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Owner:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Reply-To:References:Subject:Subject:To:To:Message-Id:Cc; bh=AqijhO2aogHj18v+z00ygxNncWrHlWh7LhsXazWWg7E=; b=CkW8msRBwjwL18TVuLNZktL7Qf0Jw0BFw78dvSDcAcNZb/Lo6AvIR4J+SLGMc+ttc4FCMtBhVV+7KwGn7c8fwJtV0ZwUbYFIvMyGhaQb9zwfJaMe0AgzVYlaFkzU+kt2FNWs1tZ++1bmAfJEwCSlxfAw7qPH6HxZ21dgreIQFN0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=pass header.from= (p=reject dis=none) Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 1766965631953482.0266612467027; Sun, 28 Dec 2025 15:47:11 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 993) id EAAF8418C9; Sun, 28 Dec 2025 18:47:10 -0500 (EST) Received: from [172.19.199.83] (lists.libvirt.org [8.43.85.245]) by lists.libvirt.org (Postfix) with ESMTP id 28EBE41897; Sun, 28 Dec 2025 18:40:30 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 993) id D62A1417F4; Sun, 28 Dec 2025 18:34:27 -0500 (EST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (3072 bits) server-digest SHA256) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id 5F98A417EB for ; Sun, 28 Dec 2025 18:34:26 -0500 (EST) 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-659-C9C5GA0cP2i1_y4CDfLhug-1; Sun, 28 Dec 2025 18:34:24 -0500 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 3AA7E18001D1 for ; Sun, 28 Dec 2025 23:34:23 +0000 (UTC) Received: from harajuku.usersys.redhat.com.homenet.telecomitalia.it (unknown [10.45.224.19]) by mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 6BC2830001A8 for ; Sun, 28 Dec 2025 23:34:22 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 4.0.1 (2024-03-26) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-5.0 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED,RCVD_IN_VALIDITY_RPBL_BLOCKED, RCVD_IN_VALIDITY_SAFE_BLOCKED,SPF_PASS autolearn=unavailable autolearn_force=no version=4.0.1 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1766964866; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=AqijhO2aogHj18v+z00ygxNncWrHlWh7LhsXazWWg7E=; b=R306vhb47LY2gQ/tJZD6qkgywkPX++T+GBQ0mUneCBP0TVAnsRCDLnnPQqrGAdDU/JbiCS GK0ez6aNbv9oHRfJRRAusBn4VYWOlHq1J3YGKQGAkdEYX1DWamL3KAbZj0f8ErJLdOv01z VOwM47Xt9nGudGrZxr88OymZFP4JKbM= X-MC-Unique: C9C5GA0cP2i1_y4CDfLhug-1 X-Mimecast-MFC-AGG-ID: C9C5GA0cP2i1_y4CDfLhug_1766964863 To: devel@lists.libvirt.org Subject: [PATCH 06/36] domain_validate: Reject NVRAM with read/write firmware Date: Mon, 29 Dec 2025 00:33:42 +0100 Message-ID: <20251228233412.1709869-7-abologna@redhat.com> In-Reply-To: <20251228233412.1709869-1-abologna@redhat.com> References: <20251228233412.1709869-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.4 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: myOwsqTuP-tmpfgXOKiViWBFtH7Ux2u-Vj-EfNim7uA_1766964863 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: NZLGQAYWVWRVVKQ3JO5I7JKURM2VNYXJ X-Message-ID-Hash: NZLGQAYWVWRVVKQ3JO5I7JKURM2VNYXJ X-MailFrom: abologna@redhat.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; header-match-devel.lists.libvirt.org-0; emergency; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.10 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: From: Andrea Bolognani via Devel Reply-To: Andrea Bolognani X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1766965633857158500 Content-Type: text/plain; charset="utf-8"; x-default="true" The combination doesn't make sense. After this change the firmware-manual-bios-rw test cases starts failing, as it should have in the first place. Signed-off-by: Andrea Bolognani --- src/conf/domain_validate.c | 14 +++++++ ...are-manual-efi-rw-nvram.x86_64-latest.args | 37 ----------------- ...ware-manual-efi-rw-nvram.x86_64-latest.err | 1 + ...ware-manual-efi-rw-nvram.x86_64-latest.xml | 40 ------------------- tests/qemuxmlconftest.c | 2 +- 5 files changed, 16 insertions(+), 78 deletions(-) delete mode 100644 tests/qemuxmlconfdata/firmware-manual-efi-rw-nvram.x86_= 64-latest.args create mode 100644 tests/qemuxmlconfdata/firmware-manual-efi-rw-nvram.x86_= 64-latest.err delete mode 100644 tests/qemuxmlconfdata/firmware-manual-efi-rw-nvram.x86_= 64-latest.xml diff --git a/src/conf/domain_validate.c b/src/conf/domain_validate.c index 4558e7b210..09c1b3f13f 100644 --- a/src/conf/domain_validate.c +++ b/src/conf/domain_validate.c @@ -1765,6 +1765,20 @@ virDomainDefOSValidate(const virDomainDef *def, } } =20 + if (loader->readonly =3D=3D VIR_TRISTATE_BOOL_NO) { + if (loader->nvramTemplate) { + virReportError(VIR_ERR_XML_DETAIL, "%s", + _("NVRAM template is not permitted when loader = is read/write")); + return -1; + } + + if (loader->nvram) { + virReportError(VIR_ERR_XML_DETAIL, "%s", + _("NVRAM is not permitted when loader is read/w= rite")); + return -1; + } + } + if (loader->stateless =3D=3D VIR_TRISTATE_BOOL_YES) { if (loader->nvramTemplate) { virReportError(VIR_ERR_XML_DETAIL, "%s", diff --git a/tests/qemuxmlconfdata/firmware-manual-efi-rw-nvram.x86_64-late= st.args b/tests/qemuxmlconfdata/firmware-manual-efi-rw-nvram.x86_64-latest.= args deleted file mode 100644 index 6b3eec0a27..0000000000 --- a/tests/qemuxmlconfdata/firmware-manual-efi-rw-nvram.x86_64-latest.args +++ /dev/null @@ -1,37 +0,0 @@ -LC_ALL=3DC \ -PATH=3D/bin \ -HOME=3D/var/lib/libvirt/qemu/domain--1-guest \ -USER=3Dtest \ -LOGNAME=3Dtest \ -XDG_DATA_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.local/share \ -XDG_CACHE_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.cache \ -XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.config \ -/usr/bin/qemu-system-x86_64 \ --name guest=3Dguest,debug-threads=3Don \ --S \ --object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-guest/master-key.aes"}' \ --blockdev '{"driver":"file","filename":"/usr/share/edk2/ovmf/OVMF.combined= .fd","node-name":"libvirt-pflash0-storage","auto-read-only":true,"discard":= "unmap"}' \ --blockdev '{"node-name":"libvirt-pflash0-format","read-only":false,"driver= ":"raw","file":"libvirt-pflash0-storage"}' \ --blockdev '{"driver":"file","filename":"/path/to/guest_VARS.fd","node-name= ":"libvirt-pflash1-storage","read-only":false}' \ --machine pc-q35-10.0,usb=3Doff,smm=3Don,dump-guest-core=3Doff,memory-backe= nd=3Dpc.ram,pflash0=3Dlibvirt-pflash0-format,pflash1=3Dlibvirt-pflash1-stor= age,acpi=3Don \ --accel kvm \ --cpu qemu64 \ --global driver=3Dcfi.pflash01,property=3Dsecure,value=3Don \ --m size=3D1048576k \ --object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":1073741824}= ' \ --overcommit mem-lock=3Doff \ --smp 1,sockets=3D1,cores=3D1,threads=3D1 \ --uuid 63840878-0deb-4095-97e6-fc444d9bc9fa \ --display none \ --no-user-config \ --nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ --mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ --rtc base=3Dutc \ --no-shutdown \ --boot strict=3Don \ --audiodev '{"id":"audio1","driver":"none"}' \ --global ICH9-LPC.noreboot=3Doff \ --watchdog-action reset \ --sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ --msg timestamp=3Don diff --git a/tests/qemuxmlconfdata/firmware-manual-efi-rw-nvram.x86_64-late= st.err b/tests/qemuxmlconfdata/firmware-manual-efi-rw-nvram.x86_64-latest.e= rr new file mode 100644 index 0000000000..d0cf62061a --- /dev/null +++ b/tests/qemuxmlconfdata/firmware-manual-efi-rw-nvram.x86_64-latest.err @@ -0,0 +1 @@ +NVRAM is not permitted when loader is read/write diff --git a/tests/qemuxmlconfdata/firmware-manual-efi-rw-nvram.x86_64-late= st.xml b/tests/qemuxmlconfdata/firmware-manual-efi-rw-nvram.x86_64-latest.x= ml deleted file mode 100644 index f6436df80f..0000000000 --- a/tests/qemuxmlconfdata/firmware-manual-efi-rw-nvram.x86_64-latest.xml +++ /dev/null @@ -1,40 +0,0 @@ - - guest - 63840878-0deb-4095-97e6-fc444d9bc9fa - 1048576 - 1048576 - 1 - - hvm - - - - = /usr/share/edk2/ovmf/OVMF.combined.fd - /path/to/guest_VARS.fd - - - - - - - - qemu64 - - - destroy - restart - destroy - - /usr/bin/qemu-system-x86_64 - - -
- - - - -