From nobody Wed May 22 23:47:55 2024 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 4Vl7K80NZFz5LH7K; Wed, 22 May 2024 23:47: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 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 4Vl7K76pzpz4c9P; Wed, 22 May 2024 23:47:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1716421676; 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=jl8jCJxvW1GZprG8JrBTQFDCk5Pc4/OlaHxPzlCBEk4=; b=JQKftniYEqbTpZczM71YvS5Y+rmAaMJFeguYvQYiEpphE58ysytntDpZ6YXxBgbWaa8+kZ BaeoRPQ0PlHRGIxGJvdaN1zio+YXLCBWmFqxQ/Rgnl+0D2LVFmbTxEoXpazb+0YiUDo1WP LiF2aFh3LakBTMFbISMY5mgPmYvceTSZMRkQSA6cOrE2f+rgcISSQsAgtn+w06wMZAw89G YOIuwHl8gTa+5ksrQd7LDPh0cE+3O/PnZ7iu/ksJxCKqV1GxBAmBMKYWdcO6zhCI4lzzHE dvVFno1yHCXF44wGR1NBZgucoz71K6OQTM6vVFxHSjxvkHvB+tps9hzrR9A+Sw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1716421676; a=rsa-sha256; cv=none; b=Z6NV+tgwklRDZh1smQ28Rpm7rQK0znIW+wv1OLXlCdwyscmp9rQ18HYsEaPSHFa35V59Zx F1mB9WWSsqKgqYuINd1PXtxng+2BSKDzROkQc3/lep6x+vca3FmyBkSaGn5CZIPBA1vzLp lNPc+4a7UOeTvZNPJbbfAfcNEy5Fb2OUi8uUqtQ0ir/8kVch+Hp6FgAS9uW6xNxSaIdsay rMb+45Y+anwDwFSJwPKY23N4wMYws9dyKDuxo4jQ4NHbl4Sa+Q7LvAQUcWW6vP7gcvmLAP 5ti7/3KdI1ekk8iHPp0HIybRB4/p9GxHoA45bzW17XAq2IGaR/IMgya3kw/7fw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1716421676; 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=jl8jCJxvW1GZprG8JrBTQFDCk5Pc4/OlaHxPzlCBEk4=; b=osRyoZ0Py5BKdo3KPHSGRk/mlP1sekz8hkeZvHW1vR/7o8+2WuQz9CqFEoiWMyBqOb+/3A gW1bKCTP34Kwh8KMU78hxjOa0BeI3ARx1SRftR0ERfxXOK9CucAtyD0bv/22/uR0tIqU4V 0YxZGvSntY+7IbgsRVr0GQMh/Vd0qTBKZ152PQe07/9ouhS6kBeU9xV5XIlL53RbUY7E+I po4/HuPULO+JtRXr9a8xqddISHM6VsYDhRSUwd9NtswoJ1+Ns6m5OaCCmWr37dxgnDXXsU oZCG9zQKbItAX42vDhxk+H7JRhWYkqdkaF8lEV32DE7iOI9/KqR0EK8hWstq4w== 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 4Vl7K764FtzQQ1; Wed, 22 May 2024 23:47:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 44MNltIF052788; Wed, 22 May 2024 23:47:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44MNltPr052785; Wed, 22 May 2024 23:47:55 GMT (envelope-from git) Date: Wed, 22 May 2024 23:47:55 GMT Message-Id: <202405222347.44MNltPr052785@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: cd73b38955f6 - stable/13 - killpg(): more carefully avoid LoR 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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/stable/13 X-Git-Reftype: branch X-Git-Commit: cd73b38955f62d9c05ded8e641a7462ca0f06179 Auto-Submitted: auto-generated The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=cd73b38955f62d9c05ded8e641a7462ca0f06179 commit cd73b38955f62d9c05ded8e641a7462ca0f06179 Author: Konstantin Belousov AuthorDate: 2023-07-07 17:19:33 +0000 Commit: Konstantin Belousov CommitDate: 2024-05-22 23:47:23 +0000 killpg(): more carefully avoid LoR (cherry picked from commit 7a70f17ac4bd64dc1a5020f963ba4380cf37b7e5) --- sys/kern/kern_proc.c | 15 +++++++++++++-- sys/kern/kern_prot.c | 6 ++---- 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/sys/kern/kern_proc.c b/sys/kern/kern_proc.c index 23d2856a3d32..28c1dd90e685 100644 --- a/sys/kern/kern_proc.c +++ b/sys/kern/kern_proc.c @@ -587,8 +587,12 @@ enterpgrp(struct proc *p, pid_t pgid, struct pgrp *pgrp, struct session *sess) ("enterpgrp: session leader attempted setpgrp")); old_pgrp = p->p_pgrp; - if (!sx_try_xlock(&old_pgrp->pg_killsx)) + if (!sx_try_xlock(&old_pgrp->pg_killsx)) { + sx_xunlock(&proctree_lock); + sx_xlock(&old_pgrp->pg_killsx); + sx_xunlock(&old_pgrp->pg_killsx); return (ERESTART); + } MPASS(old_pgrp == p->p_pgrp); if (sess != NULL) { @@ -656,11 +660,18 @@ enterthispgrp(struct proc *p, struct pgrp *pgrp) ("%s: p %p belongs to pgrp %p", __func__, p, pgrp)); old_pgrp = p->p_pgrp; - if (!sx_try_xlock(&old_pgrp->pg_killsx)) + if (!sx_try_xlock(&old_pgrp->pg_killsx)) { + sx_xunlock(&proctree_lock); + sx_xlock(&old_pgrp->pg_killsx); + sx_xunlock(&old_pgrp->pg_killsx); return (ERESTART); + } MPASS(old_pgrp == p->p_pgrp); if (!sx_try_xlock(&pgrp->pg_killsx)) { sx_xunlock(&old_pgrp->pg_killsx); + sx_xunlock(&proctree_lock); + sx_xlock(&pgrp->pg_killsx); + sx_xunlock(&pgrp->pg_killsx); return (ERESTART); } diff --git a/sys/kern/kern_prot.c b/sys/kern/kern_prot.c index a91b7ec3015f..5dea43971e3d 100644 --- a/sys/kern/kern_prot.c +++ b/sys/kern/kern_prot.c @@ -345,10 +345,8 @@ again: error = EPERM; } else { error = enterpgrp(p, p->p_pid, newpgrp, newsess); - if (error == ERESTART) { - sx_xunlock(&proctree_lock); + if (error == ERESTART) goto again; - } MPASS(error == 0); td->td_retval[0] = p->p_pid; newpgrp = NULL; @@ -458,11 +456,11 @@ again: error = enterthispgrp(targp, pgrp); } done: - sx_xunlock(&proctree_lock); KASSERT(error == 0 || newpgrp != NULL, ("setpgid failed and newpgrp is NULL")); if (error == ERESTART) goto again; + sx_xunlock(&proctree_lock); uma_zfree(pgrp_zone, newpgrp); return (error); }