From nobody Fri Dec 12 14:06:20 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=1765293698; cv=none; d=zohomail.com; s=zohoarc; b=a84OVIyDiCO3mRvG0vK8ba65pPqavL754e42gBHJ5oP2urvNFmMTQYjGEmPS9BPIzXuWOGTyTePi4lBIFDhM+By3JKhEeqatbccOgw/IPzyhB1WwGrJzmdksGq0leoPnx2PD9VgDiMZjyRe2YZw/ijz4gLNambmMZTzf9pjydRA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1765293698; 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=vBmjSl01G8VOcA+kloK1d0XxCbBtULbRoZQQJLHpzWw=; b=hyLa8m76tnpi2q1K6bx2YVBx2ZIkt9fvsW6+hPRP3cMzxur1lnBdEs1LSZ2LEq50yTASqJ+2GJ4jGQ9H5JUk4dsTOjdOQQWydpMv49co5gGYWHmTgO8HyofAYpaj3/abSKnGyyMeP0cIbRdQPI+iWMlhMZ0r7YyOogehDPVbH4c= 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 1765293698262709.6207560160539; Tue, 9 Dec 2025 07:21:38 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 993) id 73E27418E7; Tue, 9 Dec 2025 10:21:35 -0500 (EST) Received: from [172.19.199.80] (lists.libvirt.org [8.43.85.245]) by lists.libvirt.org (Postfix) with ESMTP id E5AF041BBC; Tue, 9 Dec 2025 10:20:27 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 993) id C68BD41998; Tue, 9 Dec 2025 10:03:45 -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 EFA564189F for ; Tue, 9 Dec 2025 10:03:44 -0500 (EST) Received: from mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-297-NDfLcFQJP0qe95bHZ1QxYA-1; Tue, 09 Dec 2025 10:03:43 -0500 Received: from mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.17]) (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-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 378EF19560A5 for ; Tue, 9 Dec 2025 15:03:42 +0000 (UTC) Received: from orkuz (unknown [10.44.33.57]) by mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 8D2931956095 for ; Tue, 9 Dec 2025 15:03:41 +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=1765292624; 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=vBmjSl01G8VOcA+kloK1d0XxCbBtULbRoZQQJLHpzWw=; b=JOrSugT1wCttrVxJ24mh5oaKTRHJqn2VsBUgGtyNANxFwh/1zLxsxGEWE1saMWXVIsq7+c Q+JO+wUtpZ6S+nhlPr4Q8uK07Hpynh7TsnYqQ0rEaaVm4bhtiZiV0RUgT7AGpujMoiGCXO 5Yy1MPYgs3YaHC1Rx+dznkDggRDacsQ= X-MC-Unique: NDfLcFQJP0qe95bHZ1QxYA-1 X-Mimecast-MFC-AGG-ID: NDfLcFQJP0qe95bHZ1QxYA_1765292622 To: devel@lists.libvirt.org Subject: [PATCH 4/4] util: Rework virFileIsSharedFSOverride using virFileCheckParents Date: Tue, 9 Dec 2025 16:02:30 +0100 Message-ID: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.17 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: ijaUW4gvkjslAlPc5xFh6tgZ3nvPU5iyHbMNH6tUeRQ_1765292622 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: TPXTKIESQIQOTG2YBHKAEPZQ6RSWH762 X-Message-ID-Hash: TPXTKIESQIQOTG2YBHKAEPZQ6RSWH762 X-MailFrom: jdenemar@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: Jiri Denemark via Devel Reply-To: Jiri Denemark X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1765293699889158500 Content-Type: text/plain; charset="utf-8" From: Jiri Denemark The newly introduced virFileCheckParents is generic enough to be used for checking whether a specific path or any of its parents is included in the overrides array. Signed-off-by: Jiri Denemark --- src/util/virfile.c | 35 ++++++++++++----------------------- 1 file changed, 12 insertions(+), 23 deletions(-) diff --git a/src/util/virfile.c b/src/util/virfile.c index ea68215655..9316606ce8 100644 --- a/src/util/virfile.c +++ b/src/util/virfile.c @@ -3859,6 +3859,14 @@ virFileCheckParentsCanonicalize(const char *path, } =20 =20 +static bool +virFileCheckParentsInOverrides(const char *path, + void *opaque) +{ + return g_strv_contains((const char *const *) opaque, path); +} + + /** * virFileIsSharedFSOverride: * @path: Path to check @@ -3872,7 +3880,6 @@ virFileIsSharedFSOverride(const char *path, char *const *overrides) { g_autofree char *dirpath =3D NULL; - char *p =3D NULL; int rc; =20 if (!path || path[0] !=3D '/' || !overrides) @@ -3894,29 +3901,11 @@ virFileIsSharedFSOverride(const char *path, return false; } =20 - if (g_strv_contains((const char *const *) overrides, dirpath)) - return true; + if (virFileCheckParents(dirpath, NULL, virFileCheckParentsInOverrides, + (void *) overrides) < 0) + return false; =20 - /* Continue until we've scanned the entire path */ - while (p !=3D dirpath) { - - /* Find the last slash */ - if ((p =3D strrchr(dirpath, '/')) =3D=3D NULL) - break; - - /* Truncate the path by overwriting the slash that we've just - * found with a null byte. If it is the very first slash in - * the path, we need to handle things slightly differently */ - if (p =3D=3D dirpath) - *(p+1) =3D '\0'; - else - *p =3D '\0'; - - if (g_strv_contains((const char *const *) overrides, dirpath)) - return true; - } - - return false; + return true; } =20 =20 --=20 2.52.0