From nobody Sun Oct 22 06:56:05 2023 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 4SCpxx3w7Fz4y9gj; Sun, 22 Oct 2023 06:56:05 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SCpxx3GCQz4cK4; Sun, 22 Oct 2023 06:56:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697957765; 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=4w9HyzfoqW39d/DEIqdmnQ8uQay0UGOj4p/DjY3ya4o=; b=XqkOoEeHyfzjAqPs/6V/8HyH9Cpfd2MpfB0DmZiT5T1vhod3CljVyYxhfZwMQL/QDHf8N4 OBzWYBlVw2Y0Cj4CWF9AO0nebMiIZ5uIlydE6pVHhr1ENFXhsXdPl5n8jR5PgE5aFP1Uay lAV+JiHLBdDGY1eQ/6cQqEuAc/5jfm8KtIYMbpD2Nb0KR/Xq9fKK6JyhgCaK5OSEab7w97 r6ILWbfQ9EQixNaq2ZFeJv5Nm3uhu4qiXGF2gHLUw9zOeo4AQ7h66C9SOcXIDgt/Qe8zpK 2uZstlqkUryVQlV4XJTTuFBjBpCJQablPzkX7BmJ8M3RRS/TacQN1CqPklOJrA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697957765; a=rsa-sha256; cv=none; b=EgW+qcDe8Dydud8yqIFBPQYcK5h0J9me2Z1pG4p9ZZ7x9ClBiFItBkvLN1GeDfdKU8LIIw oAM8CysFmgSnZvliG+c2LaFBB5cfWh06GrnyFkfLmu75n+dXffBdOn+xo8cMjY8OdNj4Zw 03/bSTlWNXIwqa0OKFvLnE+62L2jNFEgyjaKEdttWg6g5hUHJO3KPIoSVvN5euiucD+eX8 mVpTT+rb7lVfjpNdue3idRqqq2KJEMJRsycN7ZWKtW2/euh/ufPA4eq80lywLA5tIWPIQi wdNC+uUW1usCO6/316w+nc57ycrclb2+hONkZFnQZnyzviDfwgqRKk1daU39Jg== 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=1697957765; 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=4w9HyzfoqW39d/DEIqdmnQ8uQay0UGOj4p/DjY3ya4o=; b=OR6QySKMbudHO0Q4oc/RfzBmtZvbnVOy1PauFQ59UjBql3PH1zze82dfhvg6m65IyN3L07 +B9O/L3PvwGOag9WSSyakjmKj4vxR8oLJ+pQJHffUw96xhuyc+ER6lLDyxdB8A4qYcf+o2 slq/+WnmdixEtnvlsdY0jX+7aQXqoNu4Fe9rIWGdx/RALCDNzI3elT2BiCwbzTp1ny4y9l /QSqhzXCSUEBC7MWrSFO3mEO9IktRg3iAHMDQjgIs43xRjz/LCwJyXY3FxQS5QGrAH6OQH 9qDCYYdRyBUaCxz2TElzU52pd+HWi9ICjLyVfhDn6AgW+oT5FA68zynDxhXA3Q== 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 4SCpxx2JQDzp0g; Sun, 22 Oct 2023 06:56:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 39M6u5F9016218; Sun, 22 Oct 2023 06:56:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39M6u5XZ016215; Sun, 22 Oct 2023 06:56:05 GMT (envelope-from git) Date: Sun, 22 Oct 2023 06:56:05 GMT Message-Id: <202310220656.39M6u5XZ016215@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dmitry Chagin Subject: git: b84a836ef02d - stable/14 - vfs cache: Fallback to namei to resolve symlinks with leading / in target for non-native ABI 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: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dchagin X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: b84a836ef02de42e262ce44d46c859be288df4b0 Auto-Submitted: auto-generated The branch stable/14 has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=b84a836ef02de42e262ce44d46c859be288df4b0 commit b84a836ef02de42e262ce44d46c859be288df4b0 Author: Dmitry Chagin AuthorDate: 2023-10-19 10:33:58 +0000 Commit: Dmitry Chagin CommitDate: 2023-10-22 06:55:53 +0000 vfs cache: Fallback to namei to resolve symlinks with leading / in target for non-native ABI This is a temporary solution to fix PR before release. During 15.0 it's necessary to refactor symlinks handling between vfs & namecache. PR: 273414 Reported by: Vincent Milum Jr, Dan Kotowski, glebius Tested by: Dan Kotowski, glebius Reviewed by: Differential Revision: https://reviews.freebsd.org/D41806 MFC after: 3 days (cherry picked from commit bb8ecf259f96510b9c2146d846403393543061b7) --- sys/kern/vfs_cache.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/sys/kern/vfs_cache.c b/sys/kern/vfs_cache.c index 115d0bdd3993..8917666950c1 100644 --- a/sys/kern/vfs_cache.c +++ b/sys/kern/vfs_cache.c @@ -5337,12 +5337,14 @@ cache_fplookup_symlink(struct cache_fpl *fpl) struct nameidata *ndp; struct componentname *cnp; struct vnode *dvp, *tvp; + struct pwd *pwd; int error; ndp = fpl->ndp; cnp = fpl->cnp; dvp = fpl->dvp; tvp = fpl->tvp; + pwd = *(fpl->pwd); if (cache_fpl_islastcn(ndp)) { if ((cnp->cn_flags & FOLLOW) == 0) { @@ -5398,6 +5400,9 @@ cache_fplookup_symlink(struct cache_fpl *fpl) cache_fpl_checkpoint(fpl); return (cache_fpl_partial(fpl)); } + if (__predict_false(pwd->pwd_adir != pwd->pwd_rdir)) { + return (cache_fpl_aborted(fpl)); + } } return (0); }