From nobody Sat Oct 29 11:30:31 2022 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 4Mzxzq4wQGz4gqDY; Sat, 29 Oct 2022 11:30:31 +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 4Mzxzq4R0Qz3NhF; Sat, 29 Oct 2022 11:30:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1667043031; 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=+6VHG+gSQQx67ZQoKmgiua9ifHzPBx2Oo+dle8WSXEE=; b=vbdawhfgkEKH/KNoP9I12U+s1KHor1hRjWGx9RhSZgDMZYI3+xtHsXHvGEX2LtTyjPAlEo Gtwvv4YUzy98Zzf3kURwbSEyS9ocLN1Yyz4OQAQZz8hfQA48h3nyfyogqyZRUBw2KdPpUF dT7FXKNvW1SACx2C6vJ4h319Rtp2zLaJqAFhXTbFWwNL9YGBCYbQc6/IY3Y+6wpfI99URq a9KOXuOSIYYY6cjb9GvtTvrYGn4p5gBJU1Gb3lLuefK6ZmbtEDkG/1btKrsbh+6MAZ3KbL Gb8mb32Vuyg8SgHtGaevo1ItyWm8TCDlFaWLqYlzN8E2W3vepOfYl71cY4PImg== 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 4Mzxzq3VrKzGRx; Sat, 29 Oct 2022 11:30:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 29TBUVE4046949; Sat, 29 Oct 2022 11:30:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 29TBUVr6046948; Sat, 29 Oct 2022 11:30:31 GMT (envelope-from git) Date: Sat, 29 Oct 2022 11:30:31 GMT Message-Id: <202210291130.29TBUVr6046948@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: 6b69465efb48 - main - vfs_domount(): ensure that v_mountedhere and VIRF_MOUNTPOINT are set under the vnode lock 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: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6b69465efb48029e617282dcea5aac3e51e5e3d4 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1667043031; 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=+6VHG+gSQQx67ZQoKmgiua9ifHzPBx2Oo+dle8WSXEE=; b=EZRTqQHAX7aJSKSCDxmzmNc0yi2PcMn/g+AyKtK6vDZgJ9D1fGLiZYEWsUoo5dlCIuaalR 0sPzXzcExg/GqqGhJO5wGxiQJ6NKmcgV3swU5FA+s2cjPjyZUQDMWp7h+XGxMnHqqA7dl2 LEZdAfvyZLhGrDzODNaOPfQEjtfaaVO5HylwcpfZDK3ANMEgr2qBoAylX/r0twcBVQQES6 +GKsHxhDrhn4m0EHhtrGDxiw2lkHgv+u/cKklec1K0B6DbJuN3UE49/WOTGzfmY4OfoVl4 +9gyJJwWVmmYdYsNCYnIAkJcFijtV95S9yTiOcnUveDLpp7m5QsWNocIWap7Vg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1667043031; a=rsa-sha256; cv=none; b=B4osOhXtaivsux6k+j35HFhdKBu0PEI+XfjnU/H+RTqDrPAX3yOlW1ehyBV3lmjj2uUq+O AD+M2YpxS7usYxNS0dHbPTIlL1DGNA9FWpJM4WDynQrL1BHcqhIMrwE/5ZovoO0MVpyuZz Z2xMIYGfC19CPbHNbh3y0HcVUFBXNpdXHtvHpUNM17k8q/la4yDWnY3lzMzhStv8Z8jx8h eyHSNPGycZjIT+7VbNIG1VaOaUwTiGCe7WeTKjMo7rWbftCWWowaXSrHuMgDibPwmjyqF1 e7/z9tiLOTWZBLRPF2SOKXf124EZ6M9/UDFaFLigsUimdTVUFcD/pbSh0Dvqug== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=6b69465efb48029e617282dcea5aac3e51e5e3d4 commit 6b69465efb48029e617282dcea5aac3e51e5e3d4 Author: Konstantin Belousov AuthorDate: 2022-10-27 20:22:43 +0000 Commit: Konstantin Belousov CommitDate: 2022-10-29 11:29:55 +0000 vfs_domount(): ensure that v_mountedhere and VIRF_MOUNTPOINT are set under the vnode lock Fixes: f7833196bd6ba9bfc060a41b353422b15d6aa95b Reported and tested by: pho Reviewed by: jah, markj (previous version) Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D37198 --- sys/kern/vfs_mount.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/sys/kern/vfs_mount.c b/sys/kern/vfs_mount.c index 31566f521d22..f49312ed4f57 100644 --- a/sys/kern/vfs_mount.c +++ b/sys/kern/vfs_mount.c @@ -1201,10 +1201,16 @@ vfs_domount_first( mp->mnt_kern_flag &= ~MNTK_ASYNC; MNT_IUNLOCK(mp); + /* + * VIRF_MOUNTPOINT and v_mountedhere need to be set under the + * vp lock to satisfy vfs_lookup() requirements. + */ + VOP_LOCK(vp, LK_EXCLUSIVE | LK_RETRY); VI_LOCK(vp); vn_irflag_set_locked(vp, VIRF_MOUNTPOINT); vp->v_mountedhere = mp; VI_UNLOCK(vp); + VOP_UNLOCK(vp); cache_purge(vp); /*