From nobody Tue Feb 25 07:20:19 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Z28Bq4ZT8z5pD1l; Tue, 25 Feb 2025 07:20:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Z28Bq3YFWz3CKl; Tue, 25 Feb 2025 07:20:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1740468019; 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=U7daj8XbgpAjqDm9py65RIOYB//TbaJcbYXNCNEV6wY=; b=appdcqChe/SnDr3A/TPviU+SO+ZppvXOWp9EenOWXBYaapq9xXyFFI2L9iQXnrqTx93zhw dh77Wxzf/Be6F1Irer8DKJKR45BxCkLZGgsfwTIqmHP3cvtyaD1Od3ZCshCCXu9fwF7gsb QaSeOabKDSNVIBOdeK0Fl/FqWaDnDLBR6om9jRuiHZh7xXXdNNd4HoZLrrjQt1VY3zBkFX WLL+QV3R6wmpoxirhYOvMU1eqmEb5HeQv511yVDnKPCqqbJHEQqJgOG/g0/bxIeCO/gxn/ sOEFPklH/JmjEf52jG+hyB4dADnNhliZ7WnzEStJNFig0YSQzJSIjh02bTDNeg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1740468019; a=rsa-sha256; cv=none; b=kzLBs6pKA98UMfIOX3yutdybQLNTOJsWX1/KK6497mvTJotCmNZWgkUwOuC5ZKRpGlrroy PhPtnVxZR3UDGLZnlluKMZ/lRHmDkalDqSAKk8+el5FvAM4Vy6IDxZ9yiQJDJ7OVgDBm1T JzBPcQbGi73QcuXkcvtevSUgwIe8QU/UWJYxk/dwV95fEelIqWXtYw5USWx7629GV8oJIf RGHnNetCUPIZOiOiM1A15tRZH6DM8Wv8UgnF/fOaD2QBM54/W66IcFPljIc8UIw5TDY9vO WggvXkKHUfgznMxLuOBqIjl26NjVcZqr/Wn/E/TrASG3ysHw0Yl3Az+iW/Dytg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1740468019; 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=U7daj8XbgpAjqDm9py65RIOYB//TbaJcbYXNCNEV6wY=; b=Wt7MKDMVO5nzKkNYYUBPl3GILVPsdzD/oiPPfLQQZx2SImlRoqWYZer+sQUl/q6Nqg2IVA 8WR34eE6mVzD2SKYO37ed2MMESBXpv9Eid3i0gc+3KLgMkF1giDHpAyM9/osZyWqYzqwA8 jwJ5tKlKpP3oQn/o6KMdtm5M40LNdf57psuWRBxqcvvUHoNmQPBJXRXEQJU914JqdsgLYH rX60ximZizLDviBIeIRFOhaipqAzZOIhJJwgX5pBWl1m9Aemct8YCL7UbDqBlf+UTQZW2j kycO8ynm4h97Bq/PT4RaIjN0wUeentAy/7kHfJbpxU3ZnBngjLT+8XPkFHOOKA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Z28Bq38h8z2C2; Tue, 25 Feb 2025 07:20:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 51P7KJL3056051; Tue, 25 Feb 2025 07:20:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51P7KJkI056048; Tue, 25 Feb 2025 07:20:19 GMT (envelope-from git) Date: Tue, 25 Feb 2025 07:20:19 GMT Message-Id: <202502250720.51P7KJkI056048@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: e59991206b14 - main - fts(3): be less strict when automount does its job under us walking autofs mount List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e59991206b1463b7e85cc8aafde7f1dc03fcedcf Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=e59991206b1463b7e85cc8aafde7f1dc03fcedcf commit e59991206b1463b7e85cc8aafde7f1dc03fcedcf Author: Konstantin Belousov AuthorDate: 2025-02-21 13:07:43 +0000 Commit: Konstantin Belousov CommitDate: 2025-02-25 07:09:29 +0000 fts(3): be less strict when automount does its job under us walking autofs mount Namely, allow the file id change if the resulting file belongs to automounted filesystem. If it is, remember the updated id. This allows the ids from the automounted volumes to change without restrictions, might be a further refinement would be to only allow such inconsistency once. PR: 284914 Reported and tested by: Lexi Winter Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D49094 --- lib/libc/gen/fts.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/lib/libc/gen/fts.c b/lib/libc/gen/fts.c index 770a7b2cc322..bd193c7c6cfc 100644 --- a/lib/libc/gen/fts.c +++ b/lib/libc/gen/fts.c @@ -1132,6 +1132,7 @@ fts_safe_changedir(FTS *sp, FTSENT *p, int fd, char *path) { int ret, oerrno, newfd; struct stat sb; + struct statfs sf; newfd = fd; if (ISSET(FTS_NOCHDIR)) @@ -1144,9 +1145,15 @@ fts_safe_changedir(FTS *sp, FTSENT *p, int fd, char *path) goto bail; } if (p->fts_dev != sb.st_dev || p->fts_ino != sb.st_ino) { - errno = ENOENT; /* disinformation */ - ret = -1; - goto bail; + if (_fstatfs(newfd, &sf) != 0 || + (sf.f_flags & MNT_AUTOMOUNTED) == 0) { + errno = ENOENT; /* disinformation */ + ret = -1; + goto bail; + } + /* autofs might did the mount under us, accept. */ + p->fts_dev = sb.st_dev; + p->fts_ino == sb.st_ino; } ret = fchdir(newfd); bail: