From nobody Tue Nov 17 01:09:33 2026 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 4jT68F5WK5z71Pp2 for ; Tue, 17 Nov 2026 01:09:33 +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) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4jT68F2Phjz3C0k for ; Tue, 17 Nov 2026 01:09:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794877773; 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=QeA5749Bvhfcsd2ulJMPrS1pYaPJ6ozYAwkSkbHYv7A=; b=dGwCkIY7d9BHSLBj51dRsyQyierv+4f5XUeFFIFYQ2m8uBoyetA2jDkBFU5chLojMKD0V0 AWrRG1Sd7IQoE1G6SMZLyuRYcP66AWsmihV8IFR6zB2ysmR53lQ1wBFV3qCLWqcxJl5juM W3Ow8bCdfmYwt11y26cCcPj/t3lFXbSRFwCrngHDfIkQVHI8LqBKX4P4zctfBD7q1bYF08 6EeiOc35z0PrkWvkRrscnlYTOu9pHOdM0GacE68QuTnuiruDgNgUI9+N0hHBtmEhh7e+Wx C/5mtG2xVv6IS5p3wETQQ2x61diKrDYs2bxrzu98IabWKhQSXBvjYs0ZkjqFZA== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1794877773; b=l8h4/DVZmuc7WIEeo2Ti/vcVHUfpVMPqa/k1llyLXxVPza46Orok9C/MfQURWlyn54yA4b 0Ebmzvrme+CMDfvF2DrHi0wbBE0gwR5Dojats3I1/Z0NV3k0VrEImMZNPEzV5er0tueDnH 4KRGO16AuC4eJxMtVSfLWunHkTmQT2R0N5ugU3+SstOy1nuLRzZZusxCk6oTSbH8+aKPh0 Oeg8JNwfsefP2lZhdZI8woTL2/ALrFHFryZe/vSEsHtgcWE+8mG0Qc5xegRvSHgUsKItw7 D1MFqDBp3dvG2xTVypBsj2J1ynL5oSmY6LgV9i0S1rn79wHZQQLblUpYkyLDag== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794877773; 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=QeA5749Bvhfcsd2ulJMPrS1pYaPJ6ozYAwkSkbHYv7A=; b=hnZzj7qOC5hnVsJn/sQn7X9t6TcsZYisF0jtagejz4YbDpwIPuESVZoqpdV1ohte10MWrp FF5BRoNUtq1wPafPgnzykCXlcxYhND/UWSgpLlIq2OVEHS/UCLOSVvzB6Ga+wRSaHJkD63 UWUOSwhr5p5r7adGweLb1wPnBzfCiTO0IQQVQxi2qvRt/4vOq8GXLie7T9GdFWeQdsYPc8 vhvtJfhprQubw0zM4mZiVtowPB64orHVLubhVHlV/k8fkktJXED6VryCdI/TJQUOn03Yu/ 6xrl6zLDkhjPJaOhnmUDJsqxPz/pxqia+2951cnxhHWeQNtZNDpewIg4xNr21w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4jT68F23d2zJHd for ; Tue, 17 Nov 2026 01:09:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1f0ee by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 17 Nov 2026 01:09:33 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: d6978ed95c6f - stable/15 - namei(9): fix restart for NDINIT_ATVP List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all X-BeenThere: dev-commits-src-all@freebsd.org List-Id: Commit messages for all branches of the src repository List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list 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/15 X-Git-Reftype: branch X-Git-Commit: d6978ed95c6f1a900afa0ee4d53af23d193dad11 Auto-Submitted: auto-generated Date: Tue, 17 Nov 2026 01:09:33 +0000 Message-Id: <6afba94d.1f0ee.b8f6fed@gitrepo.freebsd.org> The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=d6978ed95c6f1a900afa0ee4d53af23d193dad11 commit d6978ed95c6f1a900afa0ee4d53af23d193dad11 Author: Konstantin Belousov AuthorDate: 2026-11-08 19:20:37 +0000 Commit: Konstantin Belousov CommitDate: 2026-11-17 00:24:56 +0000 namei(9): fix restart for NDINIT_ATVP (cherry picked from commit 2f3d64f63677a6ed4c7bb6629d92161555948038) --- sys/kern/vfs_lookup.c | 27 ++++++++++++++++++++++++++- sys/sys/namei.h | 10 +++++++--- 2 files changed, 33 insertions(+), 4 deletions(-) diff --git a/sys/kern/vfs_lookup.c b/sys/kern/vfs_lookup.c index fadc65918657..2d19dc7e818d 100644 --- a/sys/kern/vfs_lookup.c +++ b/sys/kern/vfs_lookup.c @@ -76,12 +76,15 @@ static void NDVALIDATE_impl(struct nameidata *, int); /* * Reset ndp to its original state. + * namei() supplies the starting directory again on restart, so unlike + * NDREINIT(), NAMEI_DBG_HADSTARTDIR can be set there. */ #define NDRESET(ndp) do { \ - NDREINIT_DBG(ndp); \ + NDRESET_DBG(ndp); \ ndp->ni_resflags = 0; \ ndp->ni_cnd.cn_flags &= ~NAMEI_INTERNAL_FLAGS; \ } while (0) + /* * Prepare namei() to restart. Reset components to its original state and set * ISRESTARTED flag which signals the underlying lookup code to change the root @@ -610,6 +613,7 @@ int namei(struct nameidata *ndp) { struct vnode *dp; /* the directory we are searching */ + struct vnode *atvp; /* NDINIT_ATVP() starting directory */ struct componentname *cnp; struct thread *td; struct pwd *pwd; @@ -632,6 +636,7 @@ namei(struct nameidata *ndp) abi_suffix_len = 0; target_resolved = false; abi_pass = NAMEI_ABI_PASS_ABI; + atvp = ndp->ni_startdir; #ifdef INVARIANTS KASSERT((ndp->ni_debugflags & NAMEI_DBG_CALLED) == 0, ("%s: repeated call to namei without NDREINIT", __func__)); @@ -701,6 +706,8 @@ restart: * We may need to start from scratch or pick up where it left off. */ error = cache_fplookup(ndp, &status, &pwd); + /* cache_can_fplookup() rejects ni_startdir. */ + MPASS(atvp == NULL || status == CACHE_FPL_STATUS_ABORTED); switch (status) { case CACHE_FPL_STATUS_UNSET: __assert_unreachable(); @@ -743,8 +750,17 @@ restart: false, ndp); return (ENOENT); } + /* + * namei_setup() and vfs_lookup() consume the reference + * on ni_startdir. Hold the NDINIT_ATVP() vnode so that + * a restart can reference it again. + */ + if (atvp != NULL) + vhold(atvp); error = namei_setup(ndp, &dp, &pwd); if (error != 0) { + if (atvp != NULL) + vdrop(atvp); namei_cleanup_cnp(cnp); nameicap_cleanup(ndp, error); return (error); @@ -823,6 +839,11 @@ restart: if (abi_restart) was_restarted = ISRESTARTED; ndp->ni_cnd.cn_flags |= was_restarted; + if (atvp != NULL) { + vref(atvp); + ndp->ni_startdir = atvp; + vdrop(atvp); + } goto restart; } @@ -835,6 +856,8 @@ restart: nameicap_cleanup(ndp, 0); pwd_drop(pwd); uma_zfree(namei_zone, abi_symlink); + if (atvp != NULL) + vdrop(atvp); NDVALIDATE(ndp); return (0); } @@ -908,6 +931,8 @@ out: nameicap_cleanup(ndp, error); pwd_drop(pwd); uma_zfree(namei_zone, abi_symlink); + if (atvp != NULL) + vdrop(atvp); return (error); } diff --git a/sys/sys/namei.h b/sys/sys/namei.h index 6008d83f729d..2d03bd6deb84 100644 --- a/sys/sys/namei.h +++ b/sys/sys/namei.h @@ -235,19 +235,23 @@ int cache_fplookup(struct nameidata *ndp, enum cache_fpl_status *status, #define NDINIT_PREFILL(arg) memset(arg, 0xff, offsetof(struct nameidata, \ ni_dvp_seqc)) #define NDINIT_DBG(arg) { (arg)->ni_debugflags = NAMEI_DBG_INITED; } -#define NDREINIT_DBG(arg) { \ +#define NDRESET_DBG(arg) { \ if (((arg)->ni_debugflags & NAMEI_DBG_INITED) == 0) \ panic("namei data not inited"); \ - if (((arg)->ni_debugflags & NAMEI_DBG_HADSTARTDIR) != 0) \ - panic("NDREINIT on namei data with NAMEI_DBG_HADSTARTDIR"); \ if ((arg)->ni_nctrack_mnt != NULL) \ panic("NDREINIT on namei data with leaked ni_nctrack_mnt"); \ if (!TAILQ_EMPTY(&(arg)->ni_cap_tracker)) \ panic("NDREINIT on namei data with leaked ni_cap_tracker"); \ +} +#define NDREINIT_DBG(arg) { \ + NDRESET_DBG(arg); \ + if (((arg)->ni_debugflags & NAMEI_DBG_HADSTARTDIR) != 0) \ + panic("NDREINIT on namei data with NAMEI_DBG_HADSTARTDIR"); \ (arg)->ni_debugflags = NAMEI_DBG_INITED; \ } #else #define NDINIT_PREFILL(arg) do { } while (0) +#define NDRESET_DBG(arg) do { } while (0) #define NDINIT_DBG(arg) do { } while (0) #define NDREINIT_DBG(arg) do { } while (0) #endif