From nobody Fri Nov 21 10:11:01 2025 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; 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=1762515431; cv=none; d=zohomail.com; s=zohoarc; b=L0KzdpQJKBRMhvFKlMCZI+7GaYxC09D8c9WRzUhpKDU9EgBg0I7VLiKbYyUPxK+0E7KyOG/+KGOCVxBYSw0wWw3nKesSFCTufuZTMN7WEn/+axZVKGfRHcPR45rWjjkhLHlnYjWUxIR44xvRUn6TGdaAh25ReZy9TROYKDqZgAQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1762515431; h=Content-Type:Content-Transfer-Encoding:Cc:Cc: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; bh=okRpREWgahxedqZr7wQo8tngEXNYqzaLkHiwIC8qg9w=; b=E4Ce//SMRODCfvIlKf9WXGpeptd07CRE6rAeC3E/UWZUBTITpP1Chzm/v6IqD/aakTwNm6TDmjaWQAcwTPcCRvf8SKmT9Bfpbb/t1Yuxd5BVjQ1K3gC4EitGPHTeLHvZhaJgJfajj3WnEMv3N0XKMLMiwlJJl5n5jesBb1iRlEw= 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 1762515431168139.64085880093762; Fri, 7 Nov 2025 03:37:11 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 993) id 46FEA3FB95; Fri, 7 Nov 2025 06:37:10 -0500 (EST) Received: from [172.19.199.29] (lists.libvirt.org [8.43.85.245]) by lists.libvirt.org (Postfix) with ESMTP id C52BB44988; Fri, 7 Nov 2025 06:29:53 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 993) id F335544476; Fri, 7 Nov 2025 06:29:40 -0500 (EST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.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 EA5FB44658 for ; Fri, 7 Nov 2025 06:26:46 -0500 (EST) Received: from mail-wm1-f69.google.com (mail-wm1-f69.google.com [209.85.128.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-518-ZUjEOlaxP8eUwlr7q9CMAg-1; Fri, 07 Nov 2025 06:26:45 -0500 Received: by mail-wm1-f69.google.com with SMTP id 5b1f17b1804b1-477563e531cso6343605e9.1 for ; Fri, 07 Nov 2025 03:26:45 -0800 (PST) Received: from wheatley.localdomain ([85.93.96.130]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4776bd08834sm42637565e9.15.2025.11.07.03.26.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 07 Nov 2025 03:26:42 -0800 (PST) Received: from wheatley.pinto-pinecone.ts.net (wheatley.k8r.cz [127.0.0.1]) by wheatley.localdomain (Postfix) with ESMTP id 1DAE3E161B59; Fri, 07 Nov 2025 12:26:42 +0100 (CET) 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=1762514806; 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=okRpREWgahxedqZr7wQo8tngEXNYqzaLkHiwIC8qg9w=; b=Pclr3SZ+9xi3AfwlM47VjxNwsn765HIIO+BVm4Hwx0R2u7brnktY3Vc82PzHJ1q5moaDj1 rlKqTsmw29ZUgK5o64tH7an58mydqNAmX3Fr55J8xXaps+Y8022EWLr1bp0ifVSJUy9xgn 3C15IOpSWaFFjIWcF7vK/IhkLS8I9tg= X-MC-Unique: ZUjEOlaxP8eUwlr7q9CMAg-1 X-Mimecast-MFC-AGG-ID: ZUjEOlaxP8eUwlr7q9CMAg_1762514804 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1762514804; x=1763119604; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=okRpREWgahxedqZr7wQo8tngEXNYqzaLkHiwIC8qg9w=; b=KoMohbm+vk3fO7+AYk+DAccJF4b7J4eczXD8wsCh6IuIHwCeXBcjR+YoMNrEoY4WBK +Q5FgHjnwIq3sW7m0euJfMlXUrfYej6f2A85slAzgqBtWWLVCnUStNwjjE38AGgBcs0k QRDwGl1t6n1PFdHHctb/XPxb1z068PItzRMDtU3qJuYV1JjM9ML+OuKtMfVnBiLrr13u LnNW0rYdqBjQAg0iQh9TD36Z79Ehyt717r47wkg4wdpgn0msU0wlKwmlUiEwyu56y6dR uamYi2tCdDWH3xbq6g1znnXlwGpB0MGlAhQcTIqE96i95ZBBdkOrzxW4VoTw5Okndhuf hi4A== X-Gm-Message-State: AOJu0Yzu/8eHsxUS6pHOMVAsUMsIMkNAojH+JxnxvxY+IPiJs9gS7OK/ RneOa7YA2IEpzvGQnPMvdJI1v7st69aSvasLkovN0dhHheQy8byvaNkwl2UuXrHNMII9G+1V1GI XZEUP4NMb0ELLFUpXJcJ1P9R0uCDX0swz2mscJVXdo+VsOvmenGyXKqF34Emb8pLkXs4= X-Gm-Gg: ASbGncvduEP29oB/+7B1/E7vfMZXw/APXWbeG5No1Hnx9JMkL+9aaRRPh90Dm52RoDz bVcYcvrhMXx6EoYTjfIE4z5Q1GXNrmz9Ogp82OhHEK8iXf0b8xDGZ2c2XIdWuHCCBPPKn8T9gJm t+BiRZmlmUvU+XKiPw9Xps2XlFbYm+t2vqfVlz7fY7W7Oye30Ny/ZvGMP9qi0uF6c+HjfKcXlxS bfhjjcOePuD3J4B+9BYpu/99rGOoELhgjyGrzyNQDCpEqTYeHSYxYRD1QToRFrzloYIGFEV/RQT 1P2me4XvWh0kLOLBnaxkTm3mBo+JODjLIhLq2sKumaV+LrA3B7x66lHvdzQF0SL7bUPofWD/Ag3 aaFU83y4e X-Received: by 2002:a05:600c:c4a2:b0:46e:37a7:48d1 with SMTP id 5b1f17b1804b1-4776bcc342fmr28594025e9.34.1762514804284; Fri, 07 Nov 2025 03:26:44 -0800 (PST) X-Google-Smtp-Source: AGHT+IGV0WfPq0HrDCHX+EeidfqhivFyFtYofJyVjtn4/9upFnA9yHnTLIoBLev2VKEtDvzxdpFyJg== X-Received: by 2002:a05:600c:c4a2:b0:46e:37a7:48d1 with SMTP id 5b1f17b1804b1-4776bcc342fmr28593765e9.34.1762514803893; Fri, 07 Nov 2025 03:26:43 -0800 (PST) To: devel@lists.libvirt.org Subject: [PATCH 4/7] lxc: Check ACLs before parsing the whole domain XML Date: Fri, 7 Nov 2025 12:26:32 +0100 Message-ID: <82ad9ab5942b4cc3ea252750063169a3159ada6b.1762514681.git.mkletzan@redhat.com> X-Mailer: git-send-email 2.51.2 In-Reply-To: References: MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: iPfgNqeY-vz1H_e5-LaoZcggtPfx5xjbC5ffzD2DbUA_1762514804 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-ID-Hash: Y26RSECHT3KABYIQZ5A7V3KE6O2SXW5J X-Message-ID-Hash: Y26RSECHT3KABYIQZ5A7V3KE6O2SXW5J X-MailFrom: mkletzan@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 CC: =?UTF-8?q?=D0=A1=D0=B2=D1=8F=D1=82=D0=BE=D1=81=D0=BB=D0=B0=D0=B2=20=D0=A2=D0=B5=D1=80=D0=B5=D1=88=D0=B8=D0=BD?= 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: Martin Kletzander via Devel Reply-To: Martin Kletzander X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1762515432124158500 From: Martin Kletzander Utilise the new virDomainDefIDsParseString() for that. Fixes: CVE-2025-12748 Reported-by: =D0=A1=D0=B2=D1=8F=D1=82=D0=BE=D1=81=D0=BB=D0=B0=D0=B2 =D0=A2= =D0=B5=D1=80=D0=B5=D1=88=D0=B8=D0=BD Signed-off-by: Martin Kletzander --- src/lxc/lxc_driver.c | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c index 80cf07d2e5ff..0564f3e5332e 100644 --- a/src/lxc/lxc_driver.c +++ b/src/lxc/lxc_driver.c @@ -409,6 +409,15 @@ lxcDomainDefineXMLFlags(virConnectPtr conn, const char= *xml, unsigned int flags) if (!(caps =3D virLXCDriverGetCapabilities(driver, false))) goto cleanup; =20 + /* Avoid parsing the whole domain definition for ACL checks */ + if (!(def =3D virDomainDefIDsParseString(xml, driver->xmlopt, parse_fl= ags))) + goto cleanup; + + if (virDomainDefineXMLFlagsEnsureACL(conn, def) < 0) + goto cleanup; + + g_clear_pointer(&def, virObjectUnref); + if (!(def =3D virDomainDefParseString(xml, driver->xmlopt, NULL, parse_flags))) goto cleanup; @@ -416,9 +425,6 @@ lxcDomainDefineXMLFlags(virConnectPtr conn, const char = *xml, unsigned int flags) if (virXMLCheckIllegalChars("name", def->name, "\n") < 0) goto cleanup; =20 - if (virDomainDefineXMLFlagsEnsureACL(conn, def) < 0) - goto cleanup; - if (virSecurityManagerVerify(driver->securityManager, def) < 0) goto cleanup; =20 @@ -1066,13 +1072,19 @@ lxcDomainCreateXMLWithFiles(virConnectPtr conn, if (!(caps =3D virLXCDriverGetCapabilities(driver, false))) goto cleanup; =20 - if (!(def =3D virDomainDefParseString(xml, driver->xmlopt, - NULL, parse_flags))) + /* Avoid parsing the whole domain definition for ACL checks */ + if (!(def =3D virDomainDefIDsParseString(xml, driver->xmlopt, parse_fl= ags))) goto cleanup; =20 if (virDomainCreateXMLWithFilesEnsureACL(conn, def) < 0) goto cleanup; =20 + g_clear_pointer(&def, virObjectUnref); + + if (!(def =3D virDomainDefParseString(xml, driver->xmlopt, + NULL, parse_flags))) + goto cleanup; + if (virSecurityManagerVerify(driver->securityManager, def) < 0) goto cleanup; =20 --=20 2.51.2