From nobody Mon Oct 26 19:46:48 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 4jD3zX6RDsz6xWdR for ; Mon, 26 Oct 2026 19:46:48 +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) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4jD3zX35PYz4qcl for ; Mon, 26 Oct 2026 19:46:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793044008; 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=6REG+8TT9l4V24GojRKjEvs+H6MVSA2JZBPY6UCzMk8=; b=MiUaZbncqg5ekwaH3HvYU3jzL2uj0qrSadbxoBfK4aTFoqxMQP06ynkfctxpTiA24NmIy8 /qFSUtBqHXBQKmmY3JmPh1Sr/+NAvBBAsOG4c/2X8593Y3pchj2yTRUkCkYybK9P34UzKQ gsq+lTtXhP2J1Mj2d5mK35ZsrYmFT+Ddwf1/tXvRimfAMh87Ln5gYBCNjO2zdsAsnA2Cx2 xXWZWQTgBbZdfJ4SyORoKX5vT68KG52xT2snqCNfYlOIqbkMnkNf+oFjNJVFTIDYlIVUFs 9r3m7z5CTw1gbS4/oNQmArYcRcJob0J0Znp9tvQoKJ66dBz8/zgR8PIGiUgZIw== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1793044008; b=eRo74/jZC9SCqc35rInEQtbpDUoj13uBj2hTEE56yB8YH2bTpoORiFESxQcr5peoLWvC5w vEN1x+6+2O7Lt0hU8PEEVVGtdSHoanbiagEUjusvo130CcOrNpGuhCaBxD0/wliYxTt1gY uFLiVTxRsuToBCSfeskABcDjqW44B+VS+/CDkCEQxFQ6uOR2IhmKf8UAKZKY6Ud1uhKrbx MOYzC3fCa3EwektKbqM/r2z1g4/lb7Fjp/wSAIGME02YUwsfyeifVso9QJ0GuZZz91+nbg KeoQZJ9hlWG4OkjYjcXst8HE3pCPRvYMGpC+ag5rq4axEYDtTgobP0ofi2TtAQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793044008; 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=6REG+8TT9l4V24GojRKjEvs+H6MVSA2JZBPY6UCzMk8=; b=nM1DlmcdbEtBLz6OkI9LtcAy7UF5asvbHGAHrl5HF2BuJaRxcNCklQy6cEvuij77sfH23T UXvKUEu27Z9TolhyRKGj/vCNWRdGZw7pkoO0cU8Z7V5PS38XN+5aesRG3rD7fVKf603V/A t51RRQ/JMJ66hPJdknJHabbBBcXJEAJKdO5zWzHXqCXyCgHesSBkKggr/8cSGrM0/jQ6fh ioJjblP6PAFRfMt6FpSBaGWNTPZT1STlrWy/RLn5sMJTEU+caYXBqXVTLke7YUF3VVuxV0 MOySH4sYU5YzDZ5uSjolUf4R8gbFqRhXFJF0g1Lo9mNLcHuya6lKKrY5wpOj1A== 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 4jD3zX1lFZzp12 for ; Mon, 26 Oct 2026 19:46:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 384bb by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 26 Oct 2026 19:46:48 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 5b3cfac97aab - stable/14 - sysvshm: Fix locking in shm_prison_set() 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: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 5b3cfac97aabaffce24215e4798572008f84c6ed Auto-Submitted: auto-generated Date: Mon, 26 Oct 2026 19:46:48 +0000 Message-Id: <6adfae28.384bb.24d239d9@gitrepo.freebsd.org> The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=5b3cfac97aabaffce24215e4798572008f84c6ed commit 5b3cfac97aabaffce24215e4798572008f84c6ed Author: Mark Johnston AuthorDate: 2026-09-25 21:38:06 +0000 Commit: Mark Johnston CommitDate: 2026-10-26 14:12:15 +0000 sysvshm: Fix locking in shm_prison_set() We were not acquiring the global sysvshm lock when handling cleanup of sysvshm segments. Acquire the lock in shm_prison_cleanup() instead, to be consistent with the sysv semaphore code. Reviewed by: jamie MFC after: 1 week Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D60030 (cherry picked from commit 546d15061962a8c45c779210969015e30124fe8d) --- sys/kern/sysv_shm.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/kern/sysv_shm.c b/sys/kern/sysv_shm.c index 8d1a469127c6..6942cb90873b 100644 --- a/sys/kern/sysv_shm.c +++ b/sys/kern/sysv_shm.c @@ -1304,13 +1304,11 @@ shm_prison_remove(void *obj, void *data __unused) struct prison *pr = obj; struct prison *rpr; - SYSVSHM_LOCK(); prison_lock(pr); rpr = osd_jail_get(pr, shm_prison_slot); prison_unlock(pr); if (rpr == pr) shm_prison_cleanup(pr); - SYSVSHM_UNLOCK(); return (0); } @@ -1320,6 +1318,7 @@ shm_prison_cleanup(struct prison *pr) struct shmid_kernel *shmseg; int i; + SYSVSHM_LOCK(); /* Remove any segments that belong to this jail. */ for (i = 0; i < shmalloced; i++) { shmseg = &shmsegs[i]; @@ -1328,6 +1327,7 @@ shm_prison_cleanup(struct prison *pr) shm_remove(shmseg, i); } } + SYSVSHM_UNLOCK(); } SYSCTL_JAIL_PARAM_SYS_NODE(sysvshm, CTLFLAG_RW, "SYSV shared memory");