From nobody Fri Nov 21 10:11:11 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=1762515623; cv=none; d=zohomail.com; s=zohoarc; b=m5fUAse2zc+lkhNqVMMQfKSIFF+edAFrKrwj1jFED4DA3M9bmtgnhm/ZBwu1pAhGhEAYusvmE1cFT5JvBc6CmOd1GiPKgPimegwvnUsPwfElZUbHWI1aKPLnIw1EYp3m+yUuYFBpkv4eN8ffmBB8whDixEyTgtbWyyyD3uD2fSE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1762515623; 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=Cc3+ya/FwiqumrxrTnfZDJwGk1H+U2JWjjRsB1+91rI=; b=OtAt0JcTtdkT2KHL/RnvKc53qxXCO+5r25anpVvgg3kkPMtmjInfgW9Ut34q7eWKW3p0YMHRunqWGcdLKkQo0cDoB+MglZF+Rbz4wiskBlTIgchXS3hgEb0OZQ6foeksz0uEhO5iwuOWIzMZrcS4OybHDNCUkH+nMHdyKcfaJzs= 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 1762515623184718.2440214141978; Fri, 7 Nov 2025 03:40:23 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 993) id 60A454406E; Fri, 7 Nov 2025 06:40:22 -0500 (EST) Received: from [172.19.199.29] (lists.libvirt.org [8.43.85.245]) by lists.libvirt.org (Postfix) with ESMTP id DE3FA449AC; Fri, 7 Nov 2025 06:30:12 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 993) id 6D93643DE7; Fri, 7 Nov 2025 06:30:01 -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 9793C44624 for ; Fri, 7 Nov 2025 06:26:48 -0500 (EST) Received: from mail-wr1-f71.google.com (mail-wr1-f71.google.com [209.85.221.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-519-66Z6vCBlMkKWiY9cSyj8Ig-1; Fri, 07 Nov 2025 06:26:46 -0500 Received: by mail-wr1-f71.google.com with SMTP id ffacd0b85a97d-429c9024a1dso306295f8f.2 for ; Fri, 07 Nov 2025 03:26:46 -0800 (PST) Received: from wheatley.localdomain ([85.93.96.130]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-42ac675cd25sm4674577f8f.22.2025.11.07.03.26.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 07 Nov 2025 03:26:43 -0800 (PST) Received: from wheatley.pinto-pinecone.ts.net (wheatley.k8r.cz [127.0.0.1]) by wheatley.localdomain (Postfix) with ESMTP id 29DE0E161B5A; 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=1762514808; 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=Cc3+ya/FwiqumrxrTnfZDJwGk1H+U2JWjjRsB1+91rI=; b=Nu1cNS3mSPOmeIJIKDFwP201rQk/2h/T9wlhYXHK/xCD6FjC8HrNXedj7UHCWsqut9C6ac CUfeOUvRNXK65xZ2J8FnxHCGJngGp4lBE6DZuhqHPAhA0ExOAZ2VDZ3L93TjENsVjT9mb9 WhzG0uy61CjA/+PNCIN1vcfFVkjlEuU= X-MC-Unique: 66Z6vCBlMkKWiY9cSyj8Ig-1 X-Mimecast-MFC-AGG-ID: 66Z6vCBlMkKWiY9cSyj8Ig_1762514806 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1762514805; x=1763119605; 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=Cc3+ya/FwiqumrxrTnfZDJwGk1H+U2JWjjRsB1+91rI=; b=h2763cg4hmiBkGYPhqyQ24QrfhMCSHj7qUbU/g5X1mZKSqJo3tUANpogS5hp0glrG3 hIljRCo2rz1CCvLuiAl5jThHqqfs7qJJPQxlDeD0bIAGHRgIEPTM3Klpt0G1ArFJ6qyD /adMYCPNUcv++Ic1ThzkYRi7bEgCa2MYUlvJ44B+x8EhEC842DXOKwJ0q+sQ2+H22fB8 qPq0OtdVwwMw6A+IsQxgykrEO0qAM2EU8dHBjTP/jI5VAo40UKoBRqh78Twjjz7TzZIq 5sY1QT4QXpgFupI0Dy0mIG+kl5B0dCW/xmlW1lyQQ7r+k2d+8ejtL/H4TmnFwCq4lDk8 /t+g== X-Gm-Message-State: AOJu0Yz9DEA8FUNbZ/YnT+3eXc/LV0JCqDq3uB/cn4biC9Av7xLuE+sW neKFqfc8Ik0UpSAy7bD0/LonswAJ6fIugxCEMMo5ElRzWciV6nwco8AVbTMrfOweJDXt7O1kksx 9To8ePFRfxRzLspuCmmGtuKqjnB2l3rixt3b2feLMUqQtHVB3HvB2xP5G5MOktVfuaE4= X-Gm-Gg: ASbGncvrSKnHT0gQjQlJwXUVAdEWRyhwrV50vwGhdGDI64hWwbDRhFa0yIciLR/QY5c 57+Bbsp8ZgN2L5hcPv4pFv+wCxIk2oQLqs+r3hqbAkVgL8nronTlqYx7WO2r+rJdPwsB/i9XRm1 pkihYLBtLoQiMiMe0TmJHS7cC0u7vzQwLSTIKgwzp1nmilBXdH37QOdRiKSS5Ge5eGJyOJGtsUJ NgN5lQWhhYJdNFZqsrNrhx3MGwvtjCTlMjUZ/eXIqzQVgBWELpcAmEveEeDF+cwoY/6holgSy0r /q9HNu2zrDTlfy9fYYULAC0UZ9Xmoqbb85lto9i54qOyia6ih3idGR+vfC1414sitkCwwIZt6Aa bcLW+vO9j X-Received: by 2002:a05:6000:400d:b0:429:957b:ee72 with SMTP id ffacd0b85a97d-42ae5adfdf1mr2604479f8f.53.1762514805615; Fri, 07 Nov 2025 03:26:45 -0800 (PST) X-Google-Smtp-Source: AGHT+IEZ2d5xgaHFA8X4l8dZkbcKtql4Y38Zz0LJsm8deLA/SYi56AQKbNtKBh3kxkCwCWimAPb+Ew== X-Received: by 2002:a05:6000:400d:b0:429:957b:ee72 with SMTP id ffacd0b85a97d-42ae5adfdf1mr2604436f8f.53.1762514805134; Fri, 07 Nov 2025 03:26:45 -0800 (PST) To: devel@lists.libvirt.org Subject: [PATCH 5/7] vz: Check ACLs before parsing the whole domain XML Date: Fri, 7 Nov 2025 12:26:33 +0100 Message-ID: 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: 7eqB2N7sBfyiBhudDwgdsN-j3iaod2gDHmJznF0xbq0_1762514806 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-ID-Hash: YV6BVTCNHMUIOKXNG7IMLLPFWM7ZPPDZ X-Message-ID-Hash: YV6BVTCNHMUIOKXNG7IMLLPFWM7ZPPDZ 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: 1762515623449158500 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/vz/vz_driver.c | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/src/vz/vz_driver.c b/src/vz/vz_driver.c index 571735f94054..9fd9b199cd01 100644 --- a/src/vz/vz_driver.c +++ b/src/vz/vz_driver.c @@ -789,6 +789,15 @@ vzDomainDefineXMLFlags(virConnectPtr conn, const char = *xml, unsigned int flags) if (flags & VIR_DOMAIN_DEFINE_VALIDATE) parse_flags |=3D VIR_DOMAIN_DEF_PARSE_VALIDATE_SCHEMA; =20 + /* Avoid parsing the whole domain definition for ACL checks */ + if (!(def =3D virDomainDefIDsParseString(xml, driver->xmlopt, parse_fl= ags))) + return NULL; + + if (virDomainDefineXMLFlagsEnsureACL(conn, def) < 0) + return NULL; + + g_clear_pointer(&def, virObjectUnref); + if ((def =3D virDomainDefParseString(xml, driver->xmlopt, NULL, parse_flags)) =3D=3D NULL) goto cleanup; @@ -796,9 +805,6 @@ vzDomainDefineXMLFlags(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; - dom =3D virDomainObjListFindByUUID(driver->domains, def->uuid); if (dom =3D=3D NULL) { virResetLastError(); @@ -2966,9 +2972,9 @@ vzDomainMigratePrepare3Params(virConnectPtr conn, | VZ_MIGRATION_COOKIE_DOMAIN_NAME) < 0) return -1; =20 - if (!(def =3D virDomainDefParseString(dom_xml, driver->xmlopt, - NULL, - VIR_DOMAIN_DEF_PARSE_INACTIVE))) + /* Avoid parsing the whole domain definition for ACL checks */ + if (!(def =3D virDomainDefIDsParseString(dom_xml, driver->xmlopt, + VIR_DOMAIN_DEF_PARSE_INACTIVE))) return -1; =20 if (dname) { --=20 2.51.2