From nobody Wed Jul 29 17:50:03 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 4h9Kbw0FT5z6mZxB for ; Wed, 29 Jul 2026 17:50:04 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4h9Kbv4S8Sz3ljy for ; Wed, 29 Jul 2026 17:50:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1785347403; 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=ooe+Pb2f3emv6yRK247yMnG1zO4qhhGlperiUucxELw=; b=JQB+3ccK+SRjiwH1vQy1X5fNxCvZfnstAcI5Gdv3XMRBSUgtl2wHN4f9VY0WxbJWclX9Hw mhegiAoCSMBtFla16HP+39n/fOznxEEguwFPGks2cMuTnlysmgJmAUCiXGprnohIm/3ojC e5wGPzPQZ//mRIOAtFcap/kQ+soaCGq8Ko2bwJTUs5Acz6bZRhp8kmkwSttrLuVik7Yc5Z eIVOW3RtpX8faZpBrIL3wqpaeYj0B1yH5CHa/XdmgaJPTyQo1x6Aw2loZPKsHlh5l4+Y7d h4PYOeBAsp0x+s1dphZhjQS0NFPWQ/iS74UILQFq1L8yLdOApBdXTNpDHNWzrw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1785347403; a=rsa-sha256; cv=none; b=qQGKTOJVuwTy6sed98NbWidtBhKgZFTGb5FnI8nUpgqhowGPavSTu5To12yNwU9xBkG19b gJ0o2xNCZoCIz2oJg8Z7DljmeGuO/P203QqzyB33Ob+thzZGxKiVE2w+YksZpwJwM1YCsA rLS1YpXIIn+UzD2yhwU4UU9frGL1u33f2ppXFmeIgWFcsUX3eP5FgL4oSBTaHXqdXIUWYt N80FjWr4Tgg+qJCrjLHGoKIo5qi6DH0YJ0WC/YYYXfK4l0crT/RSE1BQHxi2rNWNTwEtkr V3cziTqbB2fjkecI6YBMTDL+8grAJkleWdy4dsrFuRWVy+KWb3qa2hWSbOheTw== 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=1785347403; 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=ooe+Pb2f3emv6yRK247yMnG1zO4qhhGlperiUucxELw=; b=C1AtcpLeasO1K/aCK13GrW58aCqLhBqVtPsTugwAuuaXXom30GSVNBUJHHFHcPey1LXbsy BY4AotJueho5nW7pD8VfmL1cYE91meTTuHy0na5hSRQEulKNZky4vAEX0YIJEGakrWnGKo icZAiILcfQAVmQ/pDHRLiVFMSTZOfigVoZnwgEP/uTyE/hT8bQhkdsN3j48ZoXVTCjtydc 1rqtbr6J2P8bMw43WEzBktjX2BQdrperNqQpk67o3lSzTgBnwxNNEbw02c9oUJ/sLrxL2T FtB+yk64UW2Z+WZZQMfiuAcWjwUVQ9r7DKJnTQxN7solcIk+yfc1sVPgoEZBwA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4h9Kbv35FFzcqY for ; Wed, 29 Jul 2026 17:50:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3bf0b by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 29 Jul 2026 17:50:03 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: f6e3242535bd - releng/15.0 - zvol: Hold the zvol state writer lock when renaming 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/releng/15.0 X-Git-Reftype: branch X-Git-Commit: f6e3242535bd000596c2c51725be06c728bdf567 Auto-Submitted: auto-generated Date: Wed, 29 Jul 2026 17:50:03 +0000 Message-Id: <6a6a3d4b.3bf0b.3daa1e3a@gitrepo.freebsd.org> The branch releng/15.0 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=f6e3242535bd000596c2c51725be06c728bdf567 commit f6e3242535bd000596c2c51725be06c728bdf567 Author: Mark Johnston AuthorDate: 2026-02-09 14:54:44 +0000 Commit: Mark Johnston CommitDate: 2026-07-28 15:19:38 +0000 zvol: Hold the zvol state writer lock when renaming Otherwise nothing serializes updates to the global zvol hash table. Reviewed-by: Brian Behlendorf Reviewed-by: Alexander Motin Signed-off-by: Mark Johnston Closes #18191 Approved by: so Security: FreeBSD-EN-26:19.zfs (cherry picked from commit d7b8eef9d281f6831ac7d9cb27362509ec434fb2) (cherry picked from commit bde29083d0590bd55d0726405a81169109b1265e) --- sys/contrib/openzfs/module/os/freebsd/zfs/zvol_os.c | 2 +- sys/contrib/openzfs/module/os/linux/zfs/zvol_os.c | 2 +- sys/contrib/openzfs/module/zfs/zvol.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/contrib/openzfs/module/os/freebsd/zfs/zvol_os.c b/sys/contrib/openzfs/module/os/freebsd/zfs/zvol_os.c index 68f905124c49..c10563d19837 100644 --- a/sys/contrib/openzfs/module/os/freebsd/zfs/zvol_os.c +++ b/sys/contrib/openzfs/module/os/freebsd/zfs/zvol_os.c @@ -1249,7 +1249,7 @@ zvol_os_rename_minor(zvol_state_t *zv, const char *newname) { int error = 0; - ASSERT(RW_LOCK_HELD(&zvol_state_lock)); + ASSERT(RW_WRITE_HELD(&zvol_state_lock)); ASSERT(MUTEX_HELD(&zv->zv_state_lock)); /* Move to a new hashtable entry. */ diff --git a/sys/contrib/openzfs/module/os/linux/zfs/zvol_os.c b/sys/contrib/openzfs/module/os/linux/zfs/zvol_os.c index 89f9bc555fcf..dc47ff20fd74 100644 --- a/sys/contrib/openzfs/module/os/linux/zfs/zvol_os.c +++ b/sys/contrib/openzfs/module/os/linux/zfs/zvol_os.c @@ -1796,7 +1796,7 @@ zvol_os_rename_minor(zvol_state_t *zv, const char *newname) { int readonly = get_disk_ro(zv->zv_zso->zvo_disk); - ASSERT(RW_LOCK_HELD(&zvol_state_lock)); + ASSERT(RW_WRITE_HELD(&zvol_state_lock)); ASSERT(MUTEX_HELD(&zv->zv_state_lock)); strlcpy(zv->zv_name, newname, sizeof (zv->zv_name)); diff --git a/sys/contrib/openzfs/module/zfs/zvol.c b/sys/contrib/openzfs/module/zfs/zvol.c index b6d6f9db2597..b35817f5c830 100644 --- a/sys/contrib/openzfs/module/zfs/zvol.c +++ b/sys/contrib/openzfs/module/zfs/zvol.c @@ -1764,7 +1764,7 @@ zvol_rename_minors_impl(zvol_task_t *task) oldnamelen = strlen(oldname); - rw_enter(&zvol_state_lock, RW_READER); + rw_enter(&zvol_state_lock, RW_WRITER); for (zv = list_head(&zvol_state_list); zv != NULL; zv = zv_next) { zv_next = list_next(&zvol_state_list, zv);