From nobody Tue Mar 15 18:14:10 2022 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 CC2601A22F90; Tue, 15 Mar 2022 18:14:10 +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 4KJ1kp4TlMz57RK; Tue, 15 Mar 2022 18:14:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1647368050; 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=d4v+Ao++9UYhsgehwlfJ9l59KFQ99QyxlMmRIGX+qwg=; b=w+aivevP1nb2u8VstD8OZFdDv3W6xunf7q/V8Fxqu+8+7brmhn9/4ciIbO5kESC/UbJEkm zlSdnALlUU20/Rpc0RXXE6G/yOFCJOeuJB8hEroAiYCB83nYW4E4AgjR9MinfZpe7CmnGw HJT913/jJezZ9ziY1YrhB79uQeE6ZN53AWEVrUlz3qqyTtX+ggJe7itzUobu14lLv0ao3g ndSGxob91bQRiMrDKxWYxucUrNtR6NRovTNwyzg5vyptuHGR6PbVCbLG8zkMIDdFcQrM+s +8gdd/E02VL8Y0J9UH48hrn2g/HSkrakCElbkpNTrzLyoI0YEfNmp27/AjgIOw== 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 5D08D26B8E; Tue, 15 Mar 2022 18:14:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 22FIEAQB075054; Tue, 15 Mar 2022 18:14:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 22FIEAbP075053; Tue, 15 Mar 2022 18:14:10 GMT (envelope-from git) Date: Tue, 15 Mar 2022 18:14:10 GMT Message-Id: <202203151814.22FIEAbP075053@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 0abaf7f63023 - releng/13.0 - FreeBSD: Clean up zfsdev_close to match Linux 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org 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/13.0 X-Git-Reftype: branch X-Git-Commit: 0abaf7f630235933aca9dd5819d4c0aea9985f3a Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1647368050; 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=d4v+Ao++9UYhsgehwlfJ9l59KFQ99QyxlMmRIGX+qwg=; b=AtmV9hk4dEaxv9MFE8VSuOCQSqIZW3XplGCD2QIDlTBEl7KK5PP2Gz39QmWopurCs2KY4h EB2R3M/wHijyZ+3DFqyvAtfvalUkiBAE/hwTn7p5kk3s4+A4W/2qTTdMKU1yyMmn3l2lG9 Ef+t5kCmP/VOcbVXOLDhUD0Wz4UFfy7ZzSDor0o9Z2JUQLhYRYZgLvsvTNCnl4acX93btW ni5Rndhf2SW0t2zoMKA3oXDLIAOzh2xyDy1zMd18Yt1HsqSM01qkQl0gZgAhKaWyzQmEd1 TTzvq3EMtu/SUz7g0Yb3X/GSze9u0oDskraUboylYdFSIwr4N7yzwR5k6GEQ6g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1647368050; a=rsa-sha256; cv=none; b=rzljmki6HmFkttF2nrnaZLN5a7Vmd48N7FkOz8MbeeIU9vT/WdY2p9OqjSHdAA6jjvuYZP 2RubJRzpZpH4mLNMjlFwG+xSyE0Wo971wJNkoaQpFRpbJDPzleQE83hYgZmupeRi4+qEoV FAoOxnS+zIee+TuUvYsgPFiW+/WAwQFkfubERSvyx+BwBPgMekTvHj0DuPn9Y2Ph/Rphro kCjwuBND3ulmdEMYROWgooj9iaWtYpXRqqSIpFQ4vIdPj3WAXJos8+YVLRZJ0SGd/Rep1e dXv50wcNkMtzT0XAhbbn/qvRW+RuiEQUCZC1jeFdVfq3cJvN+5aQoXZh7x750Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch releng/13.0 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=0abaf7f630235933aca9dd5819d4c0aea9985f3a commit 0abaf7f630235933aca9dd5819d4c0aea9985f3a Author: Ryan Moeller AuthorDate: 2021-03-13 00:09:15 +0000 Commit: Mark Johnston CommitDate: 2022-03-15 18:09:52 +0000 FreeBSD: Clean up zfsdev_close to match Linux Resolve some oddities in zfsdev_close() which could result in a panic and were not present in the equivalent function for Linux. - Remove unused definition ZFS_MIN_MINOR - FreeBSD: Simplify zfsdev state destruction - Assert zs_minor is valid in zfsdev_close - Make locking around zfsdev state match Linux Reviewed-by: Brian Behlendorf Reviewed-by: Alexander Motin Signed-off-by: Ryan Moeller Closes #11720 Approved by: so Security: FreeBSD-EN-22:12.zfs --- sys/contrib/openzfs/include/sys/zfs_ioctl.h | 1 - sys/contrib/openzfs/module/os/freebsd/zfs/kmod_core.c | 18 ++++++++---------- 2 files changed, 8 insertions(+), 11 deletions(-) diff --git a/sys/contrib/openzfs/include/sys/zfs_ioctl.h b/sys/contrib/openzfs/include/sys/zfs_ioctl.h index afae576ea21a..8834c52990d0 100644 --- a/sys/contrib/openzfs/include/sys/zfs_ioctl.h +++ b/sys/contrib/openzfs/include/sys/zfs_ioctl.h @@ -525,7 +525,6 @@ typedef struct zfs_useracct { } zfs_useracct_t; #define ZFSDEV_MAX_MINOR (1 << 16) -#define ZFS_MIN_MINOR (ZFSDEV_MAX_MINOR + 1) #define ZPOOL_EXPORT_AFTER_SPLIT 0x1 diff --git a/sys/contrib/openzfs/module/os/freebsd/zfs/kmod_core.c b/sys/contrib/openzfs/module/os/freebsd/zfs/kmod_core.c index c11d4dbcf660..d5ba0d93a569 100644 --- a/sys/contrib/openzfs/module/os/freebsd/zfs/kmod_core.c +++ b/sys/contrib/openzfs/module/os/freebsd/zfs/kmod_core.c @@ -182,23 +182,21 @@ out: static void zfsdev_close(void *data) { - zfsdev_state_t *zs, *zsp = data; + zfsdev_state_t *zs = data; + + ASSERT(zs != NULL); mutex_enter(&zfsdev_state_lock); - for (zs = zfsdev_state_list; zs != NULL; zs = zs->zs_next) { - if (zs == zsp) - break; - } - if (zs == NULL || zs->zs_minor <= 0) { - mutex_exit(&zfsdev_state_lock); - return; - } + + ASSERT(zs->zs_minor != 0); + zs->zs_minor = -1; zfs_onexit_destroy(zs->zs_onexit); zfs_zevent_destroy(zs->zs_zevent); - mutex_exit(&zfsdev_state_lock); zs->zs_onexit = NULL; zs->zs_zevent = NULL; + + mutex_exit(&zfsdev_state_lock); } static int