From nobody Thu Jul 10 14:35:38 2025 X-Original-To: dev-commits-src-main@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 4bdHSp6PPQz617L3; Thu, 10 Jul 2025 14:35:38 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bdHSp5Q6kz4HPq; Thu, 10 Jul 2025 14:35:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1752158138; 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=aB6rXve+wJ1UZ/JO42GFw8zD0QnvzTmKM4C+Z/NIVsA=; b=ZbyN5jsfvTdONUf2wHomynA+s0yZcm3o/piu6Y4vmxQiZnl5mE9k5Q05ZtY+fVK+u8ThrE HsQNKibps0R7twmOXFXj0qeWgPnB1lD2RyJ+Ef2tuZGNDCraIoGEOmkh4MNG+k2MYHz6jw XldnszDxTRdSqi/RSK8o64wp0zqxjGTuZcnYCG/jVu6knR2RqKhIYD+jc1m4fQaXE0jKby ND1tBBhl14HJ2JJqtWM+wQ4EWrnqgp5ozE+9DroYqyTgiMDVo91RHwnN5QjDYvaewplSJf 860X1i4bhLYUZqH7l/bsEkWxc0HPTJIgdgroCb36XAVSNrN1uvADVzLRPHeBVg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1752158138; 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=aB6rXve+wJ1UZ/JO42GFw8zD0QnvzTmKM4C+Z/NIVsA=; b=HafdOqatWJeMDspjw3Gt8yD0rD97ggo28slfm//trN2seHBL0aMbehJMAJdUs2Kasr1g5p vsudgfY+S4H6BLNXaR3Jf4WxLDXmkTp6Lyg9891nXkNhLafMDZkwbRisnIxB7N17viep+k lqrjJfGB3BrdF5Uom9vyJkADUFtP4CT2Vw9ibayWk8HSlz1QGWD4EqCv64ATH6B+ZJ8u0U cmw17qm9V21cxUsS5B9TfjOXpDMOfX/8N1qBFxIEMabknDD3AGvq7+M7IPbdewTMoDoiqa fepoTeM+QuRblrFG4TOhptSTdmWpxSCNQ/8jzsSsotz+ZIlLt3OnrC0sxeZuug== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1752158138; a=rsa-sha256; cv=none; b=chhQ1sdxr1j00SZVwrQA7fkKE5Z8kkVmtCHPrs7denXy1XeVEWcyhmHoiMkYn4dLYXPvtn /J4sn5fsSC5zhgDEm42EES7hm6jmCKkgsYPUrMHOQO5COGMje70LgAnw5bE/Rr/bp3P8Z5 jIUNCi9pZL7gkVUf58evzR9nE0Xxk+S8FNB63aVqKq09mb7fTM3HhbUAV3qqWtf4R2EFIH yqB5zx8pw1nzRW5aO8VpMHE2LUUJxVMtO7k4OGiRc8BNjOynPlO/SpJJ9uxkfzagbscAyL Z5iRUWpWoB4bVDpbmXoIui4q1QkVZns5WBatWh0dMXlPa9scImj8WyfPUK4eHw== 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 4bdHSp4w69z19Xs; Thu, 10 Jul 2025 14:35:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 56AEZc5H096458; Thu, 10 Jul 2025 14:35:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 56AEZckU096455; Thu, 10 Jul 2025 14:35:38 GMT (envelope-from git) Date: Thu, 10 Jul 2025 14:35:38 GMT Message-Id: <202507101435.56AEZckU096455@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 63389aea24f1 - main - inotify: do not call into namei() with a locked vnode List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org 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/main X-Git-Reftype: branch X-Git-Commit: 63389aea24f15fe823c775960d77017f1a35f54b Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=63389aea24f15fe823c775960d77017f1a35f54b commit 63389aea24f15fe823c775960d77017f1a35f54b Author: Konstantin Belousov AuthorDate: 2025-07-10 07:15:13 +0000 Commit: Konstantin Belousov CommitDate: 2025-07-10 14:34:45 +0000 inotify: do not call into namei() with a locked vnode PR: 288127 Reviewed by: markj Fixes: f1f230439fa48581f40a57f095627f667a9713c3 Sponsored by: The FreeBSD Foundation Differential revision: https://reviews.freebsd.org/D51233 --- sys/kern/vfs_inotify.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sys/kern/vfs_inotify.c b/sys/kern/vfs_inotify.c index 41e73bb41a49..2b42228465a4 100644 --- a/sys/kern/vfs_inotify.c +++ b/sys/kern/vfs_inotify.c @@ -760,9 +760,11 @@ vn_inotify_add_watch(struct vnode *vp, struct inotify_softc *sc, uint32_t mask, * directory if it's specified as a vnode. */ vrefact(vp); + VOP_UNLOCK(vp); NDINIT_ATVP(&nd, LOOKUP, NOFOLLOW, UIO_SYSSPACE, dp->d_name, vp); error = namei(&nd); + vn_lock(vp, LK_SHARED | LK_RETRY); if (error != 0) break; vn_irflag_set_cond(nd.ni_vp, VIRF_INOTIFY_PARENT);