From nobody Fri Dec 19 00:04:31 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=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 1739810717736369.1154662540815; Mon, 17 Feb 2025 08:45:17 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 996) id 799E31899; Mon, 17 Feb 2025 11:45:16 -0500 (EST) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 0824A198C; Mon, 17 Feb 2025 11:45:01 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 996) id D7A3C181E; Mon, 17 Feb 2025 11:44:58 -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 24A5C180A for ; Mon, 17 Feb 2025 11:44:58 -0500 (EST) Received: from mx-prod-mc-02.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-683-mnLebJycNfymALqw_j44aA-1; Mon, 17 Feb 2025 11:44:55 -0500 Received: from mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.40]) (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-02.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id E377B18EB2CB for ; Mon, 17 Feb 2025 16:44:54 +0000 (UTC) Received: from harajuku.usersys.redhat.com.homenet.telecomitalia.it (unknown [10.44.34.139]) by mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 1E6BA19560AA for ; Mon, 17 Feb 2025 16:44:53 +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=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H5,RCVD_IN_MSPIKE_WL,RCVD_IN_VALIDITY_RPBL_BLOCKED, RCVD_IN_VALIDITY_SAFE_BLOCKED,SPF_HELO_NONE autolearn=unavailable autolearn_force=no version=3.4.4 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1739810697; 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; bh=04JUkB5Gj7Pq+Gdv4AVW2icLHzg17Fk9W3nO7t0u+b0=; b=fIgI5ElfGV4eJaRx0wx0JkcqLRz58jD/Ap9xS1z45Kv+0fNTCkLlyEcPaGkUgDV9TgABX4 A2J3JhBwUA5QffaNKOxF7f4EHfhVuVQ2aGnIFZvWDOo/zBVV+JIzBlDvWhMyiPtqY5tefs ctsPGu/ImxdYXTA+WTgclJzoWqxeHG0= X-MC-Unique: mnLebJycNfymALqw_j44aA-1 X-Mimecast-MFC-AGG-ID: mnLebJycNfymALqw_j44aA_1739810695 From: Andrea Bolognani To: devel@lists.libvirt.org Subject: [PATCH] utils: Canonicalize paths before comparing them Date: Mon, 17 Feb 2025 17:44:51 +0100 Message-ID: <20250217164451.90766-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.40 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: hTpjWKlQOIFg9H8PjK0MA69a32Izg9QX-M7mWkxrP44_1739810695 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: EIAIFEJYPHSSXXP2TXHZKBIFAUAJO7HP X-Message-ID-Hash: EIAIFEJYPHSSXXP2TXHZKBIFAUAJO7HP X-MailFrom: abologna@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: X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1739810720160019100 Content-Type: text/plain; charset="utf-8"; x-default="true" Resolves: https://issues.redhat.com/browse/RHEL-79165 Signed-off-by: Andrea Bolognani Reviewed-by: Daniel P. Berrang=C3=A9 --- src/util/virfile.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/util/virfile.c b/src/util/virfile.c index 6ac0f4efb3..7cab3d0cd6 100644 --- a/src/util/virfile.c +++ b/src/util/virfile.c @@ -3823,10 +3823,13 @@ virFileIsSharedFSOverride(const char *path, if (!path || path[0] !=3D '/' || !overrides) return false; =20 - if (g_strv_contains((const char *const *) overrides, path)) - return true; + /* Overrides have been canonicalized ahead of time, so we need to + * do the same for the provided path or we'll never be able to + * find a match if symlinks are involved */ + dirpath =3D virFileCanonicalizePath(path); =20 - dirpath =3D g_strdup(path); + if (g_strv_contains((const char *const *) overrides, dirpath)) + return true; =20 /* Continue until we've scanned the entire path */ while (p !=3D dirpath) { --=20 2.48.1