From nobody Thu Oct 19 10:34:14 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 4SB3x22fgYz4xGsX; Thu, 19 Oct 2023 10:34:14 +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 4SB3x22575z3Ymb; Thu, 19 Oct 2023 10:34:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697711654; 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=C6m8UaAImprzWyzG9F1hPX+02qSkX65oWCcdcLkJyFw=; b=LsUQ8u83oGjSTLACUNCc0ycVpvHsu9jX0q7HGGg0TbS3zuzQew+8kHBeRDMPjYBL6EEVM+ MdDqA69nbAu7LrFp/+Ul/roeWYBaKBg3ZCu+pcO5B6+/RZy39217K3OwumigOEScCjtNND wx1Ygm7IHwz15wJe6S9X4Fc2YtSV5XjoxasnTmVhlPPl8CDoobgog5cfxYQMNvcT8oFXGq /t6NHj9zTwn6zftRyZUqRo/gLiM9jmQalBwyfzWPVKUF9jArtV/t5i1y5Cv5wa50yANQQB lXtmk7EH2kkPLytnVx9Brwie0Bmt1v7Pa8Dep96cOt/BBSqiqLh4F8ISqkDUPg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697711654; a=rsa-sha256; cv=none; b=qksVxBvQiHUsv2EZgSgaiRvuF9FtytPaQtmMy4Uph+VoKGtBo8DzRZC3AobVs+2f1iy6Cs zfZWcjf7Ym1f+gnX6Ef7GDA85sk3hQL3C5xWwIESHqgIyuylONNASZwyXGSLIn8fnY05eU KnIS/XPqmvIgbs8TaYpa9KUlosi4msgg9lSVoOw33NzF0gaXsus18O/5IZUJzx90zo3PD3 pzD593a2GQ8fQSIpza6dW986g1TE/pbmwCfMUQJ9tJ5Bli2yAU0aNyAZnwhvBA5rQGQ55F bO6Gvr3FYR+0JwJIXv5gaDSOdT3c+fAiOi29opEtuH9kjRllyNrLbiYB+7cS6w== 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=1697711654; 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=C6m8UaAImprzWyzG9F1hPX+02qSkX65oWCcdcLkJyFw=; b=xUcUKzLRzD1wTbDtAoiQpqytFR6M/XTffHUMjab2ybjZ9ynj3G0xRkRhdE37pu0eKY9Uzz 24vWDOWtF9TGUaal/GA4Xz7ag0L5/L/yJCtcflDj6aZAIjlqwOhDlXlwStIaPru5pdP1Gx MhgAQzle0g8L8lWB2a0NcaWiwkL6OCPJwHuXdMLYhaP+eL2C+cArqjvJZ+zL6JN/T3geiI kgA0acCGU7JR9u+jHHU36ABZl2VRBrdI4gt1sR/bDu5IK7OrnTh/ln9IqOm1QQXXRO0G64 Q8oXmXCHze5nd42o1ZQsSPzhYa5wA3qsmBYwuMaf/KP941DRcAf6bCUr8bk2CQ== 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 4SB3x217tXzmLg; Thu, 19 Oct 2023 10:34:14 +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 39JAYEu0095529; Thu, 19 Oct 2023 10:34:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39JAYEE9095527; Thu, 19 Oct 2023 10:34:14 GMT (envelope-from git) Date: Thu, 19 Oct 2023 10:34:14 GMT Message-Id: <202310191034.39JAYEE9095527@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dmitry Chagin Subject: git: bb8ecf259f96 - main - 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/main X-Git-Reftype: branch X-Git-Commit: bb8ecf259f96510b9c2146d846403393543061b7 Auto-Submitted: auto-generated The branch main has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=bb8ecf259f96510b9c2146d846403393543061b7 commit bb8ecf259f96510b9c2146d846403393543061b7 Author: Dmitry Chagin AuthorDate: 2023-10-19 10:33:58 +0000 Commit: Dmitry Chagin CommitDate: 2023-10-19 10:33:58 +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 --- 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 99e293d5a873..4b51b3558739 100644 --- a/sys/kern/vfs_cache.c +++ b/sys/kern/vfs_cache.c @@ -5426,12 +5426,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) { @@ -5487,6 +5489,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); }