From nobody Wed Oct 07 17:01:12 2026 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 4j0KCF3CNCz6wBBx for ; Wed, 07 Oct 2026 17:01:13 +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 "YR2" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4j0KCD6clfz4Z5s for ; Wed, 07 Oct 2026 17:01:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1791392472; 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=TwPAuk8lZRpIEkce4L/HrBnf+Gg9BO69WAtXeAmPxi0=; b=cmlxAAaEmkDZ8qUosUu8WeDzJBDqUL1TjWJ/Z4qZpsHwDFDObk5ZRX1vWCPX43fEkbaNFV Ps+yhtYO+x3X2tOzx/cdGmr+VrJ0zT+NBmx29pdjqOKfZXDsq/7Q5eOUO1wbbqzSSmeJ38 C5lHkTFz1ceVXi3lJhIGkiVv78uyM4PwObI7dz2ciJ+86i3obT9HoK+hMyDWeDGFUS6PJB eyekT8+rGd4x/PpIBSyHfxW3Jq1AbjcDKrF089Xp7zcZPHPcTEt1evjCOh/bMa9/fySHOb jOl2V2MHOwOt6+GEjJH+LD5mYGmq+/C91DLuILG1KR8eIWJWQRPFm231n5bNtA== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1791392472; b=bV49G+r1PRoCVjFMlYkqFQEHCicHzcCCor7+hYmv3zBzblG9CK9mqlBX4FlBn6O3pwbz/f /QmYPyl6u+/zkh3HWwbqJaENQGWk5j2JXW0UGltA++wsUIR1Chvz1NV7CgNH34brTi23Mk xTu6iAOpKXqB86chaFaoamfvewdyZ9xb/czPiLXHWDsmpLnPj3xID1ZSB9k6fwsF4VP2hD sewSODubVKAjPXhBWIAHl62LOdsZf0BTnEupyN+5bUzEB2ln867jfeA6hzPiR/6tjTFYyX nm4TL6Gl1X/3umkeAqdLxdfXvGHkX6HwLURILX1tsDCb0IbNYsp/babZYd3ggg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1791392472; 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=TwPAuk8lZRpIEkce4L/HrBnf+Gg9BO69WAtXeAmPxi0=; b=oJ6MgUWE8BYgDDDSYhufaWv2FBbrJmrmqgAIcyiQkyEHAum5NGerEb6WuxCL2ugfQJcjUp JYND/WedM2J+LUENRtcdvgnnAEs7xf3fbZF4LQVMGaEOu4fAWtehbrwSBlDpHGNzMwDg/o kAC6YZj5GMD0d4m8Q4BWrM2ecvGl5iRjlgAbXJYkvrmvyfpDbMo2IBpxNPUCDk+8rd6rtg jVrqnLrIsIgtdsqG9kvQ5Wna0L7ZDpc6Jer+PMp3bLwjQLA+v6ZaW1vAHKRQx2MR2j0Y0B G6XkNGfzFy0/bEpMOivK6XN2uhq+kXrrL5P9MnBqskwPxKGXNtlh+ucWh3HSTw== 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 4j0KCD5jHpz12QF for ; Wed, 07 Oct 2026 17:01:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 38745 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 07 Oct 2026 17:01:12 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: bea382f25b16 - main - kern/coredump_vnode.c: avoid dumping to the mount point we suspended 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 List-Id: 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/main X-Git-Reftype: branch X-Git-Commit: bea382f25b16fec0e9a1c2be130935e739075287 Auto-Submitted: auto-generated Date: Wed, 07 Oct 2026 17:01:12 +0000 Message-Id: <6ac67ad8.38745.20d6c74a@gitrepo.freebsd.org> The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=bea382f25b16fec0e9a1c2be130935e739075287 commit bea382f25b16fec0e9a1c2be130935e739075287 Author: Konstantin Belousov AuthorDate: 2026-10-03 23:59:30 +0000 Commit: Konstantin Belousov CommitDate: 2026-10-07 17:00:53 +0000 kern/coredump_vnode.c: avoid dumping to the mount point we suspended PR: 299095 Reported by: Rick Richard Reviewed by: markj Tested by: Rick Richard (previous version) Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D60283 --- sys/kern/vfs_vnops.c | 46 +++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 45 insertions(+), 1 deletion(-) diff --git a/sys/kern/vfs_vnops.c b/sys/kern/vfs_vnops.c index 7b86bb2bdb3f..96b1c5696251 100644 --- a/sys/kern/vfs_vnops.c +++ b/sys/kern/vfs_vnops.c @@ -241,6 +241,42 @@ vfs_check_namedattr(struct vnode *vp) return (error); } +/* + * This check is performed when a vnode is opened for dumping the core + * from userspace process. The /dev/ufssuspend device allows userspace + * to suspend the UFS volume, and we must check that the dump does not + * go into the volume the coredumping process suspended. + * + * Taking MNT_ILOCK around checks is not required, because the process + * is single-threaded around dumping core, and we in particular check + * if the current process is the suspension owner. + */ +static int +vn_open_nosuspend(struct vnode *vp, u_int vn_open_flags) +{ + struct mount *mp; + struct thread *susp_owner; + int error; + + if ((vn_open_flags & VN_OPEN_COREDUMP) == 0) + return (0); + MPASS((curproc->p_flag & P_HADTHREADS) == 0 || + (curproc->p_flag & (P_SINGLE_BOUNDARY | P_SINGLE_EXIT | + P_STOPPED)) != 0); + + mp = NULL; + error = VOP_GETWRITEMOUNT(vp, &mp); + if (error != 0 || mp == NULL) + return (0); + susp_owner = atomic_load_ptr(&mp->mnt_susp_owner); + if ((atomic_load_int(&mp->mnt_kern_flag) & (MNTK_SUSPEND | + MNTK_SUSPENDED)) != 0 && susp_owner != NULL && + susp_owner->td_proc == curproc) + error = EBUSY; + vfs_rel(mp); + return (error); +} + /* * Common code for vnode open operations via a name lookup. * Lookup the vnode and invoke VOP_CREATE if needed. @@ -295,6 +331,12 @@ restart: ndp->ni_dvp = NULL; goto bad; } + error = vn_open_nosuspend(ndp->ni_dvp, vn_open_flags); + if (error != 0) { + vp = ndp->ni_dvp; + ndp->ni_dvp = NULL; + goto bad; + } VATTR_NULL(vap); vap->va_type = VREG; vap->va_mode = cmode; @@ -375,7 +417,9 @@ restart: goto bad; } } - error = vn_open_vnode(vp, fmode, cred, curthread, fp); + error = vn_open_nosuspend(vp, vn_open_flags); + if (error == 0) + error = vn_open_vnode(vp, fmode, cred, curthread, fp); if (first_open) { VI_LOCK(vp); vp->v_iflag &= ~VI_FOPENING;