From nobody Sat Feb 7 07:31:39 2026 Delivered-To: importer@patchew.org Received-SPF: none (zohomail.com: 8.43.85.245 is neither permitted nor denied by domain of lists.libvirt.org) client-ip=8.43.85.245; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Authentication-Results: mx.zohomail.com; spf=none (zohomail.com: 8.43.85.245 is neither permitted nor denied by domain of lists.libvirt.org) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 1702479796674148.40299497430385; Wed, 13 Dec 2023 07:03:16 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 996) id 569A0178C; Wed, 13 Dec 2023 10:03:15 -0500 (EST) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id F320818C7; Wed, 13 Dec 2023 09:51:39 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 996) id E9F0017B2; Wed, 13 Dec 2023 09:50:54 -0500 (EST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id 26F4117BE for ; Wed, 13 Dec 2023 09:50:29 -0500 (EST) Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-147-kWR3OQOVOpyrEa1RV_sViA-1; Wed, 13 Dec 2023 09:50:27 -0500 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.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 mimecast-mx02.redhat.com (Postfix) with ESMTPS id 16DB41018AA2 for ; Wed, 13 Dec 2023 14:50:27 +0000 (UTC) Received: from fedora.redhat.com (unknown [10.45.224.157]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8A7092026D66 for ; Wed, 13 Dec 2023 14:50:26 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-0.8 required=5.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H4, RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.4 X-MC-Unique: kWR3OQOVOpyrEa1RV_sViA-1 From: =?UTF-8?q?J=C3=A1n=20Tomko?= To: devel@lists.libvirt.org Subject: [libvirt PATCHv2 8/9] qemu: virtiofs: auto-fill idmap for unprivileged use Date: Wed, 13 Dec 2023 15:47:24 +0100 Message-ID: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.4 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Message-ID-Hash: XYAPMRPEALC7ZYPDY4WVB43X3MWV5NFC X-Message-ID-Hash: XYAPMRPEALC7ZYPDY4WVB43X3MWV5NFC X-MailFrom: jtomko@redhat.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-config-1; header-match-config-2; header-match-config-3; header-match-devel.lists.libvirt.org-0; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; suspicious-header X-Mailman-Version: 3.2.2 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Post: List-Subscribe: List-Unsubscribe: Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZM-MESSAGEID: 1702479798015100001 If the user did not specify any uid mapping, map its own user ID to ID 0 inside the container and the rest of the IDs to the first found user's authorized range in /etc/sub[ug]id https://issues.redhat.com/browse/RHEL-7386 https://gitlab.com/libvirt/libvirt/-/issues/535 Signed-off-by: J=C3=A1n Tomko --- src/qemu/qemu_virtiofs.c | 76 ++++++++++++++++++++++++++++++++++++++-- 1 file changed, 74 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_virtiofs.c b/src/qemu/qemu_virtiofs.c index 4dacd37a1c..d539d0a192 100644 --- a/src/qemu/qemu_virtiofs.c +++ b/src/qemu/qemu_virtiofs.c @@ -369,12 +369,84 @@ qemuVirtioFSSetupCgroup(virDomainObj *vm, return 0; } =20 +static int +qemuVirtioFSPrepareIdMap(virDomainFSDef *fs) +{ + g_autofree char *username =3D NULL; + g_autofree char *groupname =3D NULL; + virSubID *subuids =3D NULL; + virSubID *subgids =3D NULL; + uid_t euid =3D geteuid(); + uid_t egid =3D getegid(); + int subuidlen =3D 0; + int subgidlen =3D 0; + size_t i; + + username =3D virGetUserName(euid); + groupname =3D virGetGroupName(egid); + + fs->idmap.uidmap =3D g_new0(virDomainIdMapEntry, 2); + fs->idmap.gidmap =3D g_new0(virDomainIdMapEntry, 2); + + if ((subuidlen =3D virGetSubIDs(&subuids, "/etc/subuid")) < 0) + return -1; + + fs->idmap.uidmap[0].start =3D 0; + fs->idmap.uidmap[0].target =3D euid; + fs->idmap.uidmap[0].count =3D 1; + fs->idmap.nuidmap =3D 1; + + for (i =3D 0; i < subuidlen; i++) { + if ((subuids[i].idstr && STREQ(subuids[i].idstr, username)) || + subuids[i].id =3D=3D euid) { + fs->idmap.uidmap[1].start =3D 1; + fs->idmap.uidmap[1].target =3D subuids[i].start; + fs->idmap.uidmap[1].count =3D subuids[i].range; + fs->idmap.nuidmap++; + break; + } + } + + virSubIDsFree(&subuids, subuidlen); + + if ((subgidlen =3D virGetSubIDs(&subgids, "/etc/subgid")) < 0) + return -1; + + fs->idmap.gidmap[0].start =3D 0; + fs->idmap.gidmap[0].target =3D getegid(); + fs->idmap.gidmap[0].count =3D 1; + fs->idmap.ngidmap =3D 1; + + for (i =3D 0; i < subgidlen; i++) { + if ((subgids[i].idstr && STREQ(subgids[i].idstr, groupname)) || + subgids[i].id =3D=3D egid) { + fs->idmap.gidmap[1].start =3D 1; + fs->idmap.gidmap[1].target =3D subgids[i].start; + fs->idmap.gidmap[1].count =3D subgids[i].range; + fs->idmap.ngidmap++; + break; + } + } + + virSubIDsFree(&subgids, subgidlen); + + return 0; +} + int qemuVirtioFSPrepareDomain(virQEMUDriver *driver, virDomainFSDef *fs) { - if (fs->binary || fs->sock) + if (fs->sock) return 0; =20 - return qemuVhostUserFillDomainFS(driver, fs); + if (!fs->binary && qemuVhostUserFillDomainFS(driver, fs) < 0) + return -1; + + if (!driver->privileged && !fs->idmap.uidmap) { + if (qemuVirtioFSPrepareIdMap(fs) < 0) + return -1; + } + + return 0; } --=20 2.42.0 _______________________________________________ Devel mailing list -- devel@lists.libvirt.org To unsubscribe send an email to devel-leave@lists.libvirt.org