From nobody Fri Sep 25 21:39:37 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 4hs3y669QBz6txbc for ; Fri, 25 Sep 2026 21:39:42 +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 4hs3y65Twkz3QsK for ; Fri, 25 Sep 2026 21:39:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1790372382; 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=eW+3GM8YHsNy3VJjlBb2yfs0Q3D6ghAE/oB0AoephMY=; b=WHPFsH4j1QbBWd2WlZFb0/YWMSwPDcroFltAymr1IPApL6T3L0JxVolOeR5EpyJJWlSliW 87IRT1MyoGmSzjT4ct3BWubUBP8Vtq2wZ7Kj7opW44I3r++PXJkt7CugboQ0opCo1SH9ct soGnJ7TjCuQD4/SookFduGlV3rGyXyuFe+1XOZNUXG250EPPbaz40emrnwO6VZxBVpcEG3 5W8/rvtpL+2H6IB4ldR0O5XrQqQoOH0azN0WNDBOW0RdeCfh7tuqjqPpJJsKrNSqJ6JNkP ZnQ3j4fk1G8SFoihy6L2k211L9LM58p30HHxO7/3z5/SQiNG42GT8Ry5YCeNMw== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1790372382; b=QIKVgl0D3XmlgK6Gwbbwy/RXfPp4cR8OoODrBZmP5dC7oMl5a7GRlB1g+sv/c3RYQ+tBNp FXnSSWSMrMkDPpufnniOwN3l9XMnr9bZLWbGiI/Kl+9O4fdl97QX1+wssS+l/c8UBRd5hb Kz9Fs9m97tdo1Kgx5GuWN0/iOY++A2Kl6/e1PJkGZqeQg9DEzhOPMktGXWUpR0j7UwrM4M +1fZ3a4aRNW92AnFSEGDcUhkZPoS3YR/+IaAf99ITx3kBMo50j9sJztDar2toOLgLedxPN TnMsbK7v7OkIqTUjs1uU/f1vn4B4EFYFTTApqcCBGvYMzFWq7JLKana5ANfWFw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1790372382; 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=eW+3GM8YHsNy3VJjlBb2yfs0Q3D6ghAE/oB0AoephMY=; b=vmZvLdJY/NsFF3voBMwrajlFdug1zZQrLq1r65Gap8GHV1cKh5v0JHkxLox8NtNzjP7Vi+ zgqZi+IlYn49JdpiMV3qK8ZpJ6r2IJaeuVGugs6YrhS0jdIn4vlFKRcrHl2VwgGoF2k0h3 k+LKRjyI1PFKCKsvs8s109ljOv/hBVvS/absy1Nj7Ua8lFPrZqSUiuEP2H89BIojFx1qFM YFULSm8m9n4oiIyGgOrmryRuv51f09sx+VOT2vn2RCOhSzFjICbKQKAjNslFNYfZZMQraA +cBnlYY1H21Jmayjs4xOGcwxWNT50jinmKGZu49cGbYIz01TtUryH27E81K8qQ== 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 4hs3y64DwTzRPT for ; Fri, 25 Sep 2026 21:39:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 426ae by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 25 Sep 2026 21:39:37 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 546d15061962 - main - sysvshm: Fix locking in shm_prison_set() 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 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: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 546d15061962a8c45c779210969015e30124fe8d Auto-Submitted: auto-generated Date: Fri, 25 Sep 2026 21:39:37 +0000 Message-Id: <6ab6ea19.426ae.2f28e5e@gitrepo.freebsd.org> The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=546d15061962a8c45c779210969015e30124fe8d commit 546d15061962a8c45c779210969015e30124fe8d Author: Mark Johnston AuthorDate: 2026-09-25 21:38:06 +0000 Commit: Mark Johnston CommitDate: 2026-09-25 21:38:06 +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 --- 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");