From nobody Tue Mar 04 04:20:46 2025 X-Original-To: dev-commits-src-branches@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 4Z6MtR0PwTz5pRh8; Tue, 04 Mar 2025 04:20:47 +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 4Z6MtQ5z1Yz433D; Tue, 04 Mar 2025 04:20:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1741062046; 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=4I1VnXhqgVTUeycBizcDfh17QJvVd+Cblg8AQCpr9TI=; b=pG02bLE8PslwTOI6ggUbFh3vgoZHjQ7tav+jZ0pzRuGQI8Ad+IGnhBLd1TyyH4hAJ48Ybb hvuKEU4KcWZhdnMI1hw9TOXvIYZcC+MuZ0Ep6/SWvcmYWYtaoI7ez2cygUOB4aQGbNKB7k 5heClitzqDTJBn1ZBJxD2o1pipj27beO3gRyvd8W6acH0N2aX1oJwF4tr3qq+OfgNbkBDZ uI16kukPplzyK9quZz7BT3t/hxnFc2lpXkYh9B1K+uwfrfnMBRsWLoN8ejNKEBZwUTKHyJ LcvLBzxwL/OIso5cSubUoZj8EPJg4gRRb7c3UmsJTK8UDN+1GKD45hT5dcTD3Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1741062046; a=rsa-sha256; cv=none; b=g12HsknsCAO0KMM9175CGA7IecmgU0w+39xZFPdF87zXj8U7mQa0NgTWQbwJfW+dXwQ8H+ OCfudmjqJpcCNPg0XBMfviUqwBzs+NTfxuGQtQVvDowUsMtih9N5NAr7EuPIKVRHjnlI/N s8+3VUaNaYQjp7ciUy6g+hSzxaCwOOIwifXxSKC1zgEWt5/ZKPnddoGS53vGv+JwL7quKL OEdusAAnZFyx+1KdeA11hdjeB0DoiGeFc3Ur7o5l8CRrT2eQEq+bcc7ThniN9wlLUU1zLr FvSnH6SasktcB+iFwV9cLF1eRuEz414FrQYM7QDTMtn2vTBGRxC/z41tLTdQHA== 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=1741062046; 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=4I1VnXhqgVTUeycBizcDfh17QJvVd+Cblg8AQCpr9TI=; b=FR97O7LBCjv1VMQNcfXfOzyLpmfP98lbe0Hh/WJyFE3YT+fL4wsjVrTn0bWqrK8b5mg1Uu 3BxuO7soFysEWgB1LJeMvmp9JHzmrqqst9yK6o/+/v4xTXU6sgby7zi3HeXsroF/+1VxxB 2zWJ431ypKY519uGX8qqGfkeOoEt5dHOWRHotR9i36H9pIRXI1PhHcWzWy7YLTnUrAdw0Q JFkoluBqpJcBcgm9jghoMJLVssFz2D2vJZ1nWeebpLGN6yZCWqfRYcNUrHAt4VLV0Sz3zG e0hiHwAZTWoB4vsbTfBmlxkeZQe2natQK3F12Jmyz6xaQcjo3YVtvHp9xVTcYA== 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 4Z6MtQ4YT1z1Gpt; Tue, 04 Mar 2025 04:20:46 +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 5244KkOS065926; Tue, 4 Mar 2025 04:20:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5244Kkrk065923; Tue, 4 Mar 2025 04:20:46 GMT (envelope-from git) Date: Tue, 4 Mar 2025 04:20:46 GMT Message-Id: <202503040420.5244Kkrk065923@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 9460df357344 - stable/14 - fts(3): be less strict when automount does its job under us walking autofs mount List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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/stable/14 X-Git-Reftype: branch X-Git-Commit: 9460df357344a2848f9cab07a5228cd9615800e1 Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=9460df357344a2848f9cab07a5228cd9615800e1 commit 9460df357344a2848f9cab07a5228cd9615800e1 Author: Konstantin Belousov AuthorDate: 2025-02-21 13:07:43 +0000 Commit: Konstantin Belousov CommitDate: 2025-03-04 04:19:08 +0000 fts(3): be less strict when automount does its job under us walking autofs mount PR: 284914 (cherry picked from commit e59991206b1463b7e85cc8aafde7f1dc03fcedcf) --- 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 ff51d2b224c2..a718c4e1e85c 100644 --- a/lib/libc/gen/fts.c +++ b/lib/libc/gen/fts.c @@ -1145,6 +1145,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)) @@ -1157,9 +1158,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: