From nobody Thu Oct 22 17:31:45 2026 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 4j9Y9Z0TPvz6xP1m for ; Thu, 22 Oct 2026 17:31:46 +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 4j9Y9Y56Hdz3GRN for ; Thu, 22 Oct 2026 17:31:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1792690305; 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=qxl5DIMUor8NZ+E8bO/SRunbcWtFp+km10YPjPuul+M=; b=XjM5QulmOxsHu3+UTbqB7TrxJOnVoXed2H1a1/ql7ebk9gWCCbBE2DsaEbszXjtzoIVX51 WDNmwqRqvMmBFxc22QP8YZye1d5EFnopl6ZWWmInyagwiYr90XuOuWb04LtA6y5tR9ZSGT YFxXdEY/aXP3/M/+Ihix3r3vhuYcetfihlR6nWE+H9wjNEhHYgmyTHbiBvYUc8XNk2huzB apA0JbCLvrRWquT0cunKBuFo5xcEAHBjeFQ7xLsWx0O8n4+oPDVphQ/fvppS2trJW07sIH Ep9f6VZ4ElFHn8qOCa/19iieainMpVjTwkqKMA4U6QqItdiZFXnyUy8kTE+cXA== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1792690305; b=W6wfhMpkOlO4pxOYhaIE2YpdzQAMuvetPd9HTA+GgeAVn2Y/nM886wEYDPvWsuZe3xpNF4 ggIoNFT5fJ48+SJysxIdHSioCc07QZG+uRxyqrvVqMgOwiZ37YdL3IK0UroFL0XZj0rFuu fiWzo7HZR0bwXHxcLzr66+dsJcB16xFh5MwwaJg8HJENhdMSrlsU2DIM0vntN5MgIHajXQ ufr9W2RUpm5ds4nDJoFW4bwcbfsP2pWHFaQ4GfYgPRdH4Kcmt2EzXQAeJypdgQAvc3NRQ/ rJ+09Y65ejpQLLr2ByVMpczKD040KIngK/9oFICMf1kQqQ/lAlKDXZ65uhlmmw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1792690305; 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=qxl5DIMUor8NZ+E8bO/SRunbcWtFp+km10YPjPuul+M=; b=srEgh8TeaAFgOefETHgdvfJlB8G2RYMTnusGiNQMSKydCgq/q3IYSTte4/xuVRWMDOOT1U v0gtFQ/eiG2m6XvoK7hGylFIzgH5RMDMXm0XwkmUb2HsDHZcoJHFoVeTtyyLLVlfvOZ/ik DIRzmbXbMvEXRlySVKXCSjyNUFxIZGp4lLwObPsqFNnHuyEI6nVSO3dWlF9kwCUYKmIvqI nmLUq36193GCdELYKyRmf1HZ9qsdf7/mUj9UFiTn97oahoZziirDvF2Eqg9vfPbnu3LWiY 7lDS+1a48Oo07ePogx1HVzrZB4rImJrxUDRoptVuyxYdWIl3E+BLHEJfFMbJyg== 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 4j9Y9Y4VN9zrnK for ; Thu, 22 Oct 2026 17:31:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3e504 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 22 Oct 2026 17:31:45 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 9ecb9e804850 - stable/15 - sysvshm: Fix locking in shm_prison_set() List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: Commit messages for all branches of the 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/15 X-Git-Reftype: branch X-Git-Commit: 9ecb9e804850a530500f1ff2aff6d9e2bbb4f5bc Auto-Submitted: auto-generated Date: Thu, 22 Oct 2026 17:31:45 +0000 Message-Id: <6ada4881.3e504.101a0207@gitrepo.freebsd.org> The branch stable/15 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=9ecb9e804850a530500f1ff2aff6d9e2bbb4f5bc commit 9ecb9e804850a530500f1ff2aff6d9e2bbb4f5bc Author: Mark Johnston AuthorDate: 2026-09-25 21:38:06 +0000 Commit: Mark Johnston CommitDate: 2026-10-22 15:45:40 +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");