From owner-svn-src-head@freebsd.org Mon Oct 26 18:01:19 2020 Return-Path: Delivered-To: svn-src-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 7F88744AD54; Mon, 26 Oct 2020 18:01:19 +0000 (UTC) (envelope-from mjg@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 "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4CKjM32qFkz4Xbb; Mon, 26 Oct 2020 18:01:19 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 454D91E33C; Mon, 26 Oct 2020 18:01:19 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 09QI1JLW035211; Mon, 26 Oct 2020 18:01:19 GMT (envelope-from mjg@FreeBSD.org) Received: (from mjg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 09QI1IMb035210; Mon, 26 Oct 2020 18:01:18 GMT (envelope-from mjg@FreeBSD.org) Message-Id: <202010261801.09QI1IMb035210@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mjg set sender to mjg@FreeBSD.org using -f From: Mateusz Guzik Date: Mon, 26 Oct 2020 18:01:18 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r367064 - head/sys/kern X-SVN-Group: head X-SVN-Commit-Author: mjg X-SVN-Commit-Paths: head/sys/kern X-SVN-Commit-Revision: 367064 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 26 Oct 2020 18:01:19 -0000 Author: mjg Date: Mon Oct 26 18:01:18 2020 New Revision: 367064 URL: https://svnweb.freebsd.org/changeset/base/367064 Log: cache: add missing NIRES_ABS handling Modified: head/sys/kern/vfs_cache.c head/sys/kern/vfs_lookup.c Modified: head/sys/kern/vfs_cache.c ============================================================================== --- head/sys/kern/vfs_cache.c Mon Oct 26 17:52:28 2020 (r367063) +++ head/sys/kern/vfs_cache.c Mon Oct 26 18:01:18 2020 (r367064) @@ -3607,7 +3607,7 @@ cache_fpl_checkpoint(struct cache_fpl *fpl, struct nam } static void -cache_fpl_restore(struct cache_fpl *fpl, struct nameidata_saved *snd) +cache_fpl_restore_partial(struct cache_fpl *fpl, struct nameidata_saved *snd) { fpl->ndp->ni_cnd.cn_flags = snd->cn_flags; @@ -3616,6 +3616,17 @@ cache_fpl_restore(struct cache_fpl *fpl, struct nameid fpl->ndp->ni_pathlen = snd->ni_pathlen; } +static void +cache_fpl_restore_abort(struct cache_fpl *fpl, struct nameidata_saved *snd) +{ + + cache_fpl_restore_partial(fpl, snd); + /* + * It is 0 on entry by API contract. + */ + fpl->ndp->ni_resflags = 0; +} + #ifdef INVARIANTS #define cache_fpl_smr_assert_entered(fpl) ({ \ struct cache_fpl *_fpl = (fpl); \ @@ -3846,7 +3857,7 @@ cache_fplookup_partial_setup(struct cache_fpl *fpl) return (cache_fpl_aborted(fpl)); } - cache_fpl_restore(fpl, &fpl->snd); + cache_fpl_restore_partial(fpl, &fpl->snd); ndp->ni_startdir = dvp; cnp->cn_flags |= MAKEENTRY; @@ -4696,6 +4707,7 @@ cache_fplookup(struct nameidata *ndp, enum cache_fpl_s cnp->cn_nameptr = cnp->cn_pnbuf; if (cnp->cn_pnbuf[0] == '/') { cache_fpl_handle_root(ndp, &dvp); + ndp->ni_resflags |= NIRES_ABS; } else { if (ndp->ni_dirfd == AT_FDCWD) { dvp = pwd->pwd_cdir; @@ -4730,7 +4742,7 @@ out: */ break; case CACHE_FPL_STATUS_ABORTED: - cache_fpl_restore(&fpl, &orig); + cache_fpl_restore_abort(&fpl, &orig); break; } return (error); Modified: head/sys/kern/vfs_lookup.c ============================================================================== --- head/sys/kern/vfs_lookup.c Mon Oct 26 17:52:28 2020 (r367063) +++ head/sys/kern/vfs_lookup.c Mon Oct 26 18:01:18 2020 (r367064) @@ -511,6 +511,8 @@ namei(struct nameidata *ndp) cnp->cn_origflags = cnp->cn_flags; #endif ndp->ni_cnd.cn_cred = ndp->ni_cnd.cn_thread->td_ucred; + KASSERT(ndp->ni_resflags == 0, ("%s: garbage in ni_resflags: %x\n", + __func__, ndp->ni_resflags)); KASSERT(cnp->cn_cred && td->td_proc, ("namei: bad cred/proc")); KASSERT((cnp->cn_flags & NAMEI_INTERNAL_FLAGS) == 0, ("namei: unexpected flags: %" PRIx64 "\n",