From nobody Sun Oct 22 18:47:15 2023 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 4SD6kX0n4Zz4xgfj; Sun, 22 Oct 2023 18:47:16 +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 4SD6kX0DCpz4mHq; Sun, 22 Oct 2023 18:47:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698000436; 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=5dpRTHTzWt5TxXAf3qddw9sEsUBwXcm9kPRLNCfaeVA=; b=tVbT+34o8IRsgjNb2FSw2hvF0KH8q3iqcDxDJ0NJVmU/TLrT9IT2u1vfDahveTETEEFYl7 UyQkEIYsz5P3irvBLuD5IWmJtF3jhpV6S/NxubgsVP6MvXBimdLzCAkU5hhmSt7D7DwCNB qG7aeJ6E+zZc6wE6NGV12nQoe7IXTs58rjP/vJJItLS82di3t9LKJ6jHfjQwjDzwyELbtx 6nKE/+FBcJ4ND/CaHU9pbupqNaXX0VMrjKdXB269L2nvrNgODhHz3ON2AEDb4k5KhyYEig j/hyxOVJytLL7AOz5tsBW3j5yvDq4/n3qlz5asd7gdf/374/W50qONgS45BjBw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698000436; a=rsa-sha256; cv=none; b=jVtWGCuCNCAu9+JhvGtf0gn185FWzn7FU62hkKRLo9g/Hf3itZhM9g9Ia/OVqNZOzhq6WN lvAX6Z070uMV+QSQSKU9Cpjy7N6pfV/vl6c7OHjmzXm/aK5XCR1HJg+2873ECeH29gGPCR tqpxCeszsyNlD7CaNzy1JscYRVDdgeMX89Zwx6XgczCBoAvV0//On8p0xCJWNMKeP1vEVR INuMiPoUOU/qDZHzRYuPfu1EqeydnBxnKHWEtyFlXMDCFdqJQICU6GP86y2qHQvX118S2O DaGcobT03ran2CSJ/Ghu+XNelc2tw40iV7KcKkPwPVkVANSXKrNKU/2CLVaukw== 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=1698000436; 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=5dpRTHTzWt5TxXAf3qddw9sEsUBwXcm9kPRLNCfaeVA=; b=pyNEwHPWEywcAnqimbZPfa4067F8nzI4pcaVQdECpubMejITjWpOJ99w3i2abX6ALvr3rX gNaHJ9VNnXe35nBGFTP1TrB+TGmq/duHRiVHKBtVbVmmkC0esmUo7XwBVupCudGsT78pTU B83Z/o6qBNww4hYVlfBNHXtziMOjTq8tbcKEx2TrSH5GMvL6gXP7QGRcNVrJT+h9mYrjmD yv1oWi7h0Y3CiGGslg/aKCJQ6LcAJIxWnh/HqjmFYJ0FDeV6uyunGrozdmelOwxgsss4xZ R37CCTXbehGV+RKFBNgyx2AeIJ9AUJwh4xmCRJRx6mTwI1+E2oQ23r+bTFlmAg== 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 4SD6kW6Hh7z17st; Sun, 22 Oct 2023 18:47:15 +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 39MIlFIZ000873; Sun, 22 Oct 2023 18:47:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39MIlFJI000870; Sun, 22 Oct 2023 18:47:15 GMT (envelope-from git) Date: Sun, 22 Oct 2023 18:47:15 GMT Message-Id: <202310221847.39MIlFJI000870@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: accbd5ad06c3 - releng/14.0 - vfs cache: Fallback to namei to resolve symlinks with leading / in target for non-native ABI 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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/releng/14.0 X-Git-Reftype: branch X-Git-Commit: accbd5ad06c3eeb17d75cde05597f70f1fedb061 Auto-Submitted: auto-generated The branch releng/14.0 has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=accbd5ad06c3eeb17d75cde05597f70f1fedb061 commit accbd5ad06c3eeb17d75cde05597f70f1fedb061 Author: Dmitry Chagin AuthorDate: 2023-10-19 10:33:58 +0000 Commit: Dmitry Chagin CommitDate: 2023-10-22 18:46:22 +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. Approved by: re (gjb) 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) (cherry picked from commit b84a836ef02de42e262ce44d46c859be288df4b0) --- 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); }