From nobody Mon Feb 2 09:27:36 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=1767645718; cv=none; d=zohomail.com; s=zohoarc; b=PirzRboOwBL7rsVa3h5bKznoYgjT8OQXfbA18d55Uc7jPfpRYiIeDUe9VQSxd22ReV5HBxhftEQyghUQyRasSMtTvedYixUv630AYoWzhIv3xdruhJk8oKuxJ/YfKB4R6e9VKL2qYf62NjcGwjXa13jGT2wHGS8kkXb9nqLJNGg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1767645718; 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=SZsx/ldHMEPCMcMtqFwsYmp4NIVR38n8S0hh7CYEcQE=; b=NEV0o7V1dPvTp2J3L+6/ww7b4UTbgaht9d2FR6ueszcYkkkcHb3IhjDfRL2mf9ysrD7NK0J1hgjSuccQqRBlPsa9JcoFXwwd6V3PNL4PIlsWwSdDXhd1PC6HDvT1AgVXJqA1G6U4wiNVaKG7O9A6k4jsnXHtMW+zQUnSH/COeDM= 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 1767645718053836.4467046502757; Mon, 5 Jan 2026 12:41:58 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 993) id 1CF9E3FD2A; Mon, 5 Jan 2026 15:41:55 -0500 (EST) Received: from [172.19.199.83] (lists.libvirt.org [8.43.85.245]) by lists.libvirt.org (Postfix) with ESMTP id 6FBF94198C; Mon, 5 Jan 2026 15:40:19 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 993) id A41BA4192F; Mon, 5 Jan 2026 15:33:54 -0500 (EST) Received: from smtp-relay-internal-0.canonical.com (smtp-relay-internal-0.canonical.com [185.125.188.122]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (3072 bits)) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id 8AAFD41939 for ; Mon, 5 Jan 2026 15:33:51 -0500 (EST) Received: from mail-yw1-f200.google.com (mail-yw1-f200.google.com [209.85.128.200]) (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 smtp-relay-internal-0.canonical.com (Postfix) with ESMTPS id 646C43FCF4 for ; Mon, 5 Jan 2026 20:28:44 +0000 (UTC) Received: by mail-yw1-f200.google.com with SMTP id 00721157ae682-78f9d077d9cso4688837b3.3 for ; Mon, 05 Jan 2026 12:28:44 -0800 (PST) Received: from r.lxd ([147.219.77.79]) by smtp.gmail.com with ESMTPSA id 00721157ae682-790aa57deacsm65117b3.20.2026.01.05.12.28.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 05 Jan 2026 12:28:42 -0800 (PST) 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=canonical.com; s=20251003; t=1767644924; bh=SZsx/ldHMEPCMcMtqFwsYmp4NIVR38n8S0hh7CYEcQE=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=mZU1ZSQxX41KtDjQWPNp38Pp4ltE98HLJMOLnyhR/DmQR7HE25ngE9H/sYr1MIqhd HERymOHrSpNjyvSagBGcfz8VoCxY0NrLDEqk8dPYYQQeQrBFs7/VW7Xm1j5U/ZkG4c Oh6hPvgLYkUtNr0DmfNWgnVgQlqBGMeLLcMkEEMHfyXQaB1x6ZnshGBYnw8I3G016n cDuZr8g8Wn2RnjPprmsOS4omfH4RJ2yRhoNq/LZGHB1nfvaP03nzSETd0uWG3/kU+J bQ5tNnNjd+XDNCP5cB3ciBYfkDAZAzocJUT4pmC0qmpzVPjghEmIst2altLHaXtjHm 7ZHBcdaU7rMfEQGSemEfVVYUDX1lVX9eIBxsSM5hhopZbXqeTbp+0ch6OxquoX+PC1 4GJ5Yw9gQyUc63a9wTXd1sdJw7F1hcI6j3dRah7kuZmEbvN2vUKLXi88/uS7LcQIZG k6dCEWymUxLrfYmDliepYSELSN/bapRHG/c3JVDjuISoukWvo8cL0qVDbLAhXI0gP3 75j8OKq4GqgBbebGDnMzkb4L1HMktNjBJ86o37z8dFHaX+83T/cDKWlHpJZK47JBAz i0w+XyL/gkZ+dqN+6jh011UHwIVnqHCcETKNs/XYO/pKlgB3UzCNR7gB/UBc6omI+h LrekKyPNXPO7YP0psArfEgC8= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1767644923; x=1768249723; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=SZsx/ldHMEPCMcMtqFwsYmp4NIVR38n8S0hh7CYEcQE=; b=Oj2grcal8dRTWlQ4gqNGjF7xTxnmwq89SCGatQ11j1LGwIX2v3n40VxqWD8TzNhlyc Ky0JxSgQBST3a0I6wm3yMs9tkefRcqlmq1gg9v/DHQQNEu7Yk+oAj4D01vWOcdyQooab d7RTbxSx24MYjfGpjIAwxJdTxFGDNulHhWeKO+ihau0QKOZrSCyKNkalepm4ej1vFpf8 fVBp42wYtWoU2Ki4dEK3Eie93GniBpYCuWS3nPOsDUy61QITZIqEruuF5XEn5O4JPAah VB35xI32C3TuO1QXLXALxVbAkyyBlL3nF2TXaPnfk5iSmuDQeUyQjyhV9yxDZkKxVvd6 8fIQ== X-Gm-Message-State: AOJu0YxT/of1HDetxnDaD+vatNQSpSq3KqX4LKAK3LHEaFlBxddPCSco w2RnM8+RR5otEkzM8jDNQyx6kbhI1TdPPThVdW7GVfnOwfMg3lT6auO+xueHwvne+0HCtWNKAVz 8qzpJ4/1FQHWQfYnKT4CvLi5kn188KMVWw4uaLB1Wha8tyQmmMAorEqIIWIV+LyvSoJFMm5z56Z c= X-Gm-Gg: AY/fxX7+V9SQAJBCerr2Ic0mmWMyEH66tk34+maOjLeAKwAmr08PQJaVqnH0xJFNocv qeCqZ+FVH6jSGHc1KAZgnY+p0+z4dPYcSHl8B2S6fmt+TlOXA/72EwXpR2P66ZmZh8DMj1XT2HI u7DfMzJh4PquIdg2eKI7nVS41f26meOSdv7XltMZm3HpGp73011y1uuflyMOlqC8kqhHGWBVDTC zyqLUhchOPeNOfHHfrXe57sTeHFrSr1f8EgAQW/wjDpNNPn7Mbun5bulI/1Ll7Lu5mMy7ntPwV4 byOmcNLcK8J11LsHzH+fnfQ0lOR8+WIXgVV8s47fygLG5fPd3nA/SrGKjCujJKpQU+ttymsyea6 U0gX8qRnCtTT8jRMT X-Received: by 2002:a05:690c:4483:b0:788:763:17bd with SMTP id 00721157ae682-790a8b60e60mr7584517b3.60.1767644923379; Mon, 05 Jan 2026 12:28:43 -0800 (PST) X-Google-Smtp-Source: AGHT+IG2BsGrSBcA2mzVEgektvwh/Vi8vVN4BvGeIZfVoRjintIOTQQ1JDgC9ipCwr+MME8L8ifYYw== X-Received: by 2002:a05:690c:4483:b0:788:763:17bd with SMTP id 00721157ae682-790a8b60e60mr7584337b3.60.1767644923001; Mon, 05 Jan 2026 12:28:43 -0800 (PST) Date: Mon, 05 Jan 2026 14:27:22 -0600 Subject: [PATCH 2/3] qemu: Store tapfd path in domstatus XML MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260105-apparmor-races-v1-2-932cf0e990b7@canonical.com> References: <20260105-apparmor-races-v1-0-932cf0e990b7@canonical.com> In-Reply-To: <20260105-apparmor-races-v1-0-932cf0e990b7@canonical.com> To: devel@lists.libvirt.org X-Mailer: b4 0.14.3 X-Developer-Signature: v=1; a=openpgp-sha256; l=4866; i=wesley.hershberger@canonical.com; h=from:subject:message-id; bh=QAXKvQbSh1d3iAoU7CRUFNr35WabcbyuGzCokXoOfww=; b=owEB7QES/pANAwAKAfkogKziOh25AcsmYgBpXB73DFuODKrX0SUdcAHB6d/hXSZPqgpAUiqnY CBwtEQuFf+JAbMEAAEKAB0WIQQsIHxFLwpehxEbQ8r5KICs4joduQUCaVwe9wAKCRD5KICs4jod uSohC/9w227QFLgiNQS8UMWyfZLfjF1wilm0rxUO7RfDnPaJxEgf0M6QxMNRvGof57lOKB0JmSx lxqom0KTwJnQmPjtXMiIxtZO4YUgXRLW8+dQinZEp4/rF/3Y7MCbr2j/kjWC+9gA4AQjGVHmFsE zeijR79I5/2w/im9oBJDL8gLMa2HqP50asgWnoD8w2tDvX369tmWfEFpecZmP1l97IXfvAgp4du csNEb2iG2L1BNFwvEDGyFWoiFNGDCdgkk13lF8wuAXwC1GUl5szAhz2qQ1pyNvaihnZyGk13Hyf Ynsp0Plgv86gCf5rsZUJ0zj8WMDyiOhpzT3kg0pOc00eKM4nhV5hIXDsM9IDUsscO5/EtsmZh3d 7+EtrezeV7IyppL5TQn9CWI50kf7rpzIWVPftimG/Fm8cl00Smq1IE1UEcxWAOl3uN4oQEZN5sI 8efD9jgJ1wmfa9FVJ3C4uZWEgPIfxxeeHnhGLjLzoVBWr97FwNv4NTOE+4hYSQ4VLoQJQ= X-Developer-Key: i=wesley.hershberger@canonical.com; a=openpgp; fpr=2C207C452F0A5E87111B43CAF92880ACE23A1DB9 Message-ID-Hash: HOJZ5XHGJOJ6FBHN3TTYTP6GGKMPRO24 X-Message-ID-Hash: HOJZ5XHGJOJ6FBHN3TTYTP6GGKMPRO24 X-MailFrom: wesley.hershberger@canonical.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: wesley.hershberger@canonical.com, georgia.garcia@canonical.com, hector.cao@canonical.com 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: Wesley Hershberger via Devel Reply-To: Wesley Hershberger X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1767645718473158500 Introduce a read-only `tapfd` element for interfaces of type network, bridge, direct, and ethernet, which contains the path in `/dev` to the backing tapfd for that interface. The element is only included when the domain is being formatted for internal consumption (VIR_DOMAIN_DEF_FORMAT_STATUS) and is not accepted in user-provided XML (!VIR_DOMAIN_DEF_PARSE_INACTIVE). This is used by the AppArmor security driver when re-generating profiles. Partial-Resolves: #692 Bug-Ubuntu: https://bugs.launchpad.net/bugs/2126574 Signed-off-by: Wesley Hershberger --- src/conf/domain_conf.c | 10 ++++++++++ src/conf/domain_conf.h | 1 + src/qemu/qemu_command.c | 9 +++++++++ src/security/security_apparmor.c | 1 + src/security/virt-aa-helper.c | 5 +++++ 5 files changed, 26 insertions(+) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 541dad5bdc..bfeed3dc96 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -2936,6 +2936,9 @@ virDomainNetDefFree(virDomainNetDef *def) g_free(def->virtio); g_free(def->coalesce); g_free(def->sourceDev); + if (def->tapfdpath) { + g_free(def->tapfdpath); + } =20 virNetDevIPInfoClear(&def->guestIP); virNetDevIPInfoClear(&def->hostIP); @@ -10427,6 +10430,10 @@ virDomainNetDefParseXML(virDomainXMLOption *xmlopt, return NULL; } =20 + if (!(flags & VIR_DOMAIN_DEF_PARSE_INACTIVE)) { + def->tapfdpath =3D virXPathString("string(./tapfd/@path)", ctxt); + } + if (virNetworkPortOptionsParseXML(ctxt, &def->isolatedPort) < 0) return NULL; =20 @@ -25596,6 +25603,9 @@ virDomainNetDefFormat(virBuffer *buf, if (def->mtu) virBufferAsprintf(buf, "\n", def->mtu); =20 + if (def->tapfdpath && (flags & VIR_DOMAIN_DEF_FORMAT_STATUS)) + virBufferAsprintf(buf, "\n", def->tapfdpath); + virDomainNetDefCoalesceFormatXML(buf, def->coalesce); =20 virDomainDeviceInfoFormat(buf, &def->info, flags | VIR_DOMAIN_DEF_FORM= AT_ALLOW_BOOT diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index cb35ff06bd..cadbc3e36d 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -1201,6 +1201,7 @@ struct _virDomainNetDef { char *downscript; char *domain_name; /* backend domain name */ char *ifname; /* interface name on the host () */ + char *tapfdpath; /* Path for the device's tapfd in /dev on the host */ virTristateBool managed_tap; virNetDevIPInfo hostIP; char *ifname_guest_actual; diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 98229d7cf9..96352821d7 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -8880,9 +8880,18 @@ qemuBuildInterfaceConnect(virDomainObj *vm, =20 for (i =3D 0; i < tapfdSize; i++) { g_autofree char *name =3D g_strdup_printf("tapfd-%s%zu", net->= info.alias, i); + g_autofree char *procpath =3D NULL; int fd =3D tapfd[i]; /* we want to keep the array intact for s= ecurity labeling*/ =20 netpriv->tapfds =3D g_slist_prepend(netpriv->tapfds, qemuFDPas= sDirectNew(name, &fd)); + + /* Include tapfd path in the domstatus XML */ + procpath =3D g_strdup_printf("/proc/self/fd/%d", tapfd[i]); + + if (virFileResolveLink(procpath, &net->tapfdpath) < 0) { + /* it's a deleted file, presumably. Ignore? */ + VIR_WARN("could not find path for descriptor %s, skipping"= , procpath); + } } =20 netpriv->tapfds =3D g_slist_reverse(netpriv->tapfds); diff --git a/src/security/security_apparmor.c b/src/security/security_appar= mor.c index 68ac39611f..13dbce67c3 100644 --- a/src/security/security_apparmor.c +++ b/src/security/security_apparmor.c @@ -156,6 +156,7 @@ load_profile(virSecurityManager *mgr G_GNUC_UNUSED, =20 if (virDomainDefFormatInternal(def, NULL, &buf, VIR_DOMAIN_DEF_FORMAT_SECURE | + VIR_DOMAIN_DEF_FORMAT_STATUS | VIR_DOMAIN_DEF_FORMAT_VOLUME_TRANSLATED= ) < 0) return -1; =20 diff --git a/src/security/virt-aa-helper.c b/src/security/virt-aa-helper.c index 9598b95432..7920162cdc 100644 --- a/src/security/virt-aa-helper.c +++ b/src/security/virt-aa-helper.c @@ -1174,6 +1174,11 @@ get_files(vahControl * ctl) vhu->type) !=3D 0) return -1; } + + if (net->tapfdpath) { + if (vah_add_file(&buf, net->tapfdpath, "rwk") !=3D 0) + return -1; + } } =20 for (i =3D 0; i < ctl->def->nmems; i++) { --=20 2.51.0