From nobody Wed Oct 14 02:22:15 2026 X-Original-To: dev-commits-src-branches@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 4j4FMq6py3z6wNMP for ; Wed, 14 Oct 2026 02:22:15 +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 4j4FMq5TG5z5466 for ; Wed, 14 Oct 2026 02:22:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1791944535; 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=wyj8sqkpk9ZzPw1iJz8qRUk3LKd8wKI0y26jIvtwC6s=; b=XmbNM/dRTRxoqTYZjdhgcCjOvoWut9NmmMiGCNs1gb1e5hlyeK7X01gLinf6Uf6wOLTSu4 dRkmSvZAVP2DehMPuVDxlvwOx+iUHgqw82KFGGnd9JSs5SeiIWd8c2TOKbQf8GcjshWvSU 60gq+Xwr3ibufB2Sb57vqdKS39dd+/9sI5nam0xYsatkZRV4PIdt4KrL4KtQobM29uwkhJ RxynQR/0qWA5gLUNo/J6vHJxH0ez3nUbeqc2/IqRE8ghc020DDsSmhsaRv2Xx1l5HXDuR0 1jDjGGAt0zTLIj3PpOMc+93kSyWngY7bhEs6lcoYsK4gEb0pj4DfgzpM9Mp9MQ== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1791944535; b=ZKeJhlCO2LwsFu5wnLkXZ1DG5v5jmGjJGj2NqeWkydwTIoEM1Nr7u1qnShkzEC34LwyJ6p dQdB1mR7ji0OobNh/c90dE/aTZLVCyR0wr0WQDUer+GEf2rajzutxombTpc/WAkUu5EAZo OX5qQrBPlJ6uyq+Mylht5mmhhnHoU10sbZCv2SrQUwPA2ws/cHE61L47ESmBiEobfs/PWk dAkuEExKYzpQ+xUP32uxgNVozdVBnRrXoNYsIT7DVeCnTQ5dN4UDpqGTaTuCJhteEtJsKX +rL1KuL+h/8szB8tcAxZO9dnQZFBUJjQSd1CZoC0ZOuB1bLBkORRsXkQda1Psw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1791944535; 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=wyj8sqkpk9ZzPw1iJz8qRUk3LKd8wKI0y26jIvtwC6s=; b=kiTlRubg7uZrZdvyiwTiF4vah/Z+3rb3NGJ7xkOo6/1Hip8CakV048o0Kr/ABAAN/Dl6L8 RmNRrqtaIaMcpNDFTBY7UqPD5J+rs3ENSwIMxhOszsnX+qRW5FEsNt44xrMR6IOTn58K5J 8cgCH1v4jKwO6MXTiG89mAfYdU11yzXu43PEQt02iMaQN2h7CpZf6Jm/sohBqSN+bgIN39 iP7WPlL4nFJQ93+IiykH7qneG5MbmGGuHwsBAfy9YXjbkM8l70/vnR2YHuz8EvPr+A+Mn0 Qdxltb9qbj6AK+dvqw5i7QYoa4Cwp9QaG9GRIX6IXIcXs7/SNzGG8LKCf8BW2A== 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 4j4FMq4GQxzjhB for ; Wed, 14 Oct 2026 02:22:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1ff23 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 14 Oct 2026 02:22:15 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 4b3c29b5b214 - stable/15 - kern/coredump_vnode.c: avoid dumping to the mount point we suspended List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org List-Id: Commits to the stable branches of the FreeBSD 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: 4b3c29b5b2148195dd94c78ec8ceec5cb554cc87 Auto-Submitted: auto-generated Date: Wed, 14 Oct 2026 02:22:15 +0000 Message-Id: <6acee757.1ff23.6833d9ab@gitrepo.freebsd.org> The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=4b3c29b5b2148195dd94c78ec8ceec5cb554cc87 commit 4b3c29b5b2148195dd94c78ec8ceec5cb554cc87 Author: Konstantin Belousov AuthorDate: 2026-10-03 23:59:30 +0000 Commit: Konstantin Belousov CommitDate: 2026-10-14 02:21:54 +0000 kern/coredump_vnode.c: avoid dumping to the mount point we suspended PR: 299095 (cherry picked from commit bea382f25b16fec0e9a1c2be130935e739075287) --- 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 bc3a029ed249..6e2ace420441 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;