From nobody Mon Nov 02 10:45:51 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 4jJ7fD2yYYz6y4yP for ; Mon, 02 Nov 2026 10:45:56 +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 4jJ7fD2D2mz4c5w for ; Mon, 02 Nov 2026 10:45:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793616356; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=iif75YNSTn7G45TTWqV2bCJFmCXuC6p9a4OtoMbqUBg=; b=kj/CViwcdJR3gerCUADnQZQ6rzHlduFDC4UZsDmTmzKysIPr7XuwfZnFpv1ATXWedYCQ3Y atyA7AG42gh3F/6lkFQkMkVdRCkTOgbsFzfkmcVT0MtLonw3MFNEy4w8PQomXHzLxZq843 bj/w5F7DRuv4kZ4R8DrJhFgJU/dyWO4cej3yPJxPXaES1tBoz+wfGkVnXPyi1Hku7oY4VD +/w1Keq2xixO6TMDpseAA27z+f1n6r371due2BdZm/to3SdjbO55EehcuEsfWPCdfKq9s/ l0Fun3mdfIhoeQp1oR86Hlz2+gyg516tok7C0yTw9QbGCCIlYEMnhuONmPWxlQ== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1793616356; b=dBK6tZJ4m/qcMc9zr2n+9E2RkCv3RrSNR9axUC9rCcogxzL5jmsyzaYp+2Q4rEhFbq0CUF ntqOTXrAo354BXC3xWhW1kPAOYCLcWTKG5QGamCgrLyeYnhSL1xVpBsGlfTIK2x3ahyPHX Btrez/GtlHw91ZiuYvoseD+1zxngU15L//iXPeEjQ9ndrRDntjkthb2lJKqbqJ50pnJlGb vgP8vHuGon0LTcoxChk90fMeKtuLwQFMV5Mt7Y+um0QgzFKsXzv+FnzPGUr1tWculU6g8C bhrODPhNPvBcURdBOi7yzQEGUK1R8fJO9j4GNw3z5gCWkpYnnnKCQSa6pAE2fA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793616356; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=iif75YNSTn7G45TTWqV2bCJFmCXuC6p9a4OtoMbqUBg=; b=QT9+gFEtgzV/sT6pYj0/0SXKJXUN1NQ0E5cMroSt8tbpVzr77OADtn1hXqUPe+IMR9teNg yFw37wYbzRZJ9RpZ3DNCFNHrKmctW8d33Y05KYtKBhHiFh3twCJLD8sysvjyjyvXool7vq AHK5DJrvy3SPrVuSJStxGDmgQIvbtjdUkG3zxTbiI6Hn6SYAHDKEK5YK+CF/Ohamc1T/3j 6uOpM5RTLfPOZGcHiQ6gy0LlbAV4CEQEE5QHcoDCi37aBzYlXmoJoBqOaLpRlitt9+1953 COiYWHPy4mPsiF5lCwBFbiaX5cWrEAnJLufB9aKqGxhDkCIpnf5FJPJYYmOCyQ== 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 4jJ7fD1tNPzj08 for ; Mon, 02 Nov 2026 10:45:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1d59e by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 02 Nov 2026 10:45:51 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Nimish Jain From: Konstantin Belousov Subject: git: b9f1f9b60c6f - stable/15 - fix p9fs_vget_common() panics List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: b9f1f9b60c6f7ddff4fa87de161a62ef1ed3a859 Auto-Submitted: auto-generated Date: Mon, 02 Nov 2026 10:45:51 +0000 Message-Id: <6ae869df.1d59e.6a365085@gitrepo.freebsd.org> The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=b9f1f9b60c6f7ddff4fa87de161a62ef1ed3a859 commit b9f1f9b60c6f7ddff4fa87de161a62ef1ed3a859 Author: Nimish Jain AuthorDate: 2026-08-03 23:08:31 +0000 Commit: Konstantin Belousov CommitDate: 2026-11-02 10:39:49 +0000 fix p9fs_vget_common() panics (cherry picked from commit 2d21dbaaaf75558b42a000561eb6224b6c1c0615) --- sys/fs/p9fs/p9fs_vfsops.c | 56 +++++++++++++---------------------------------- sys/fs/p9fs/p9fs_vnops.c | 3 --- 2 files changed, 15 insertions(+), 44 deletions(-) diff --git a/sys/fs/p9fs/p9fs_vfsops.c b/sys/fs/p9fs/p9fs_vfsops.c index 94a67fdef428..697a86595edf 100644 --- a/sys/fs/p9fs/p9fs_vfsops.c +++ b/sys/fs/p9fs/p9fs_vfsops.c @@ -259,7 +259,7 @@ p9fs_vget_common(struct mount *mp, struct p9fs_node *np, int flags, struct p9fs_node *node; struct thread *td; uint32_t hash; - int error, error_reload = 0; + int error; struct p9fs_inode *inode; td = curthread; @@ -348,57 +348,31 @@ p9fs_vget_common(struct mount *mp, struct p9fs_node *np, int flags, if (vp->v_type != VFIFO) VN_LOCK_ASHARE(vp); error = insmntque(vp, mp); - if (error != 0) { - /* - * vput(vp) is already called from insmntque_stddtr(). - * Just goto 'out' to dispose the node. - */ - goto out; - } + if (error != 0) + return (error); /* Init the vnode with the disk info*/ error = p9fs_reload_stats_dotl(vp, curthread->td_ucred); if (error != 0) { - error_reload = 1; - goto out; + P9FS_NODE_SETF(np, P9FS_NODE_DELETED); + vgone(vp); + vput(vp); + return (error); } error = vfs_hash_insert(vp, hash, flags, td, vpp, p9fs_node_cmp, &fid->qid); - if (error != 0) { - goto out; - } + if (error != 0 || *vpp != NULL) + return (error); - if (*vpp == NULL) { - P9FS_LOCK(vses); - STAILQ_INSERT_TAIL(&vses->virt_node_list, np, p9fs_node_next); - P9FS_NODE_SETF(np, P9FS_NODE_IN_SESSION); - P9FS_UNLOCK(vses); - vn_set_state(vp, VSTATE_CONSTRUCTED); - *vpp = vp; - } else { - /* - * Returning matching vp found in hashlist. - * So cleanup the np allocated above in this context. - */ - if (!IS_ROOT(np)) { - p9fs_destroy_node(&np); - } - } + P9FS_LOCK(vses); + STAILQ_INSERT_TAIL(&vses->virt_node_list, np, p9fs_node_next); + P9FS_NODE_SETF(np, P9FS_NODE_IN_SESSION); + P9FS_UNLOCK(vses); + vn_set_state(vp, VSTATE_CONSTRUCTED); + *vpp = vp; return (0); -out: - /* Something went wrong, dispose the node */ - if (!IS_ROOT(np)) { - p9fs_destroy_node(&np); - } - - if (error_reload) { - vput(vp); - } - - *vpp = NULLVP; - return (error); } /* Main mount function for 9pfs */ diff --git a/sys/fs/p9fs/p9fs_vnops.c b/sys/fs/p9fs/p9fs_vnops.c index 0ac86343649f..f795371bb7ea 100644 --- a/sys/fs/p9fs/p9fs_vnops.c +++ b/sys/fs/p9fs/p9fs_vnops.c @@ -113,9 +113,6 @@ p9fs_cleanup(struct p9fs_node *np) if ((np->flags & P9FS_NODE_IN_SESSION) != 0) { P9FS_NODE_CLRF(np, P9FS_NODE_IN_SESSION); STAILQ_REMOVE(&vses->virt_node_list, np, p9fs_node, p9fs_node_next); - } else { - P9FS_UNLOCK(vses); - return; } P9FS_UNLOCK(vses);