From nobody Wed Jul 9 00:38:54 2025 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 4bcJxr00Jxz60nqw; Wed, 09 Jul 2025 00:38:56 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bcJxp6m5Vz4BNQ; Wed, 09 Jul 2025 00:38:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1752021535; 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=SoYjbedoTMd3VQYjG+RBil7n6u7wXO4cIQvEXx1wCOk=; b=T+vtKBglvCgJbfghHYjTTeS81w3ZCezOlXLlwnFiKrlBqfh2yP98eGJU7aqsgw8Xd/fc7H KWtEmir6FG85PqYDYvsXhvEh3oiMfdXx5wMBzuaQ4i6LUxAtlKTduBJ/axgEutklN/Hlwi DLvmEuESDm0M+ZmcU1rzniDV1uMtETRmPhL0A1fZ34acWtte374L3t/R1mszEHTTH+JwgV UDAJozl41X7bG8ZLYSWSu+Ydr9TolK/KJC/3nzntir2oOQACGwPS78PWE7E8qxLrlTwvzG FeCgZROClIyWN09F5YgJun52j5DeQwkIwsNMjuPYqhjkr6oF3zE9+yIsfglrCw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1752021535; 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=SoYjbedoTMd3VQYjG+RBil7n6u7wXO4cIQvEXx1wCOk=; b=tGfIe7PhboaBv3QAZpJxQZIpYiOpiKChtQXcQi+8nZHow+ZmoFMcc3H7vpGWW3SRaYeNMe kFjB4sqvWxuogWKjylyaLsVBHUFFxmTDqdh6QBHwz8i+m7w6MhU2ch3sioa9t0ZPajX0JB mT1A2cX0BAkUkmpxSV09zh96OFL9KDAuXQBFLAZ9Vpqbdf6mo0Oh4KI6AEz6hD0XWdl2Ww b1QDBdO549nyB9KSb+WHDUcfaeMmwq/LP+zyncUEUzbpu/YDZiKNVPqmlrbf8SzsyVyylr RfUIP/6YZFZM4aF7JZl6d8l5yrDw7TuVB5J7U/6p6/QFI5ycUBpkpvSl1nwQ0g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1752021535; a=rsa-sha256; cv=none; b=QxDbL7udCoDaaO13Xp5QAng7hLu7MJVQJ/CVmQuVa10il0zQVpN9tZNIcjW2X9NpF6oYmy qPZKe329XBDcSVggBY4fGR23ay2b9Zcv51fDVbpSRuCKso5DTr5YjU2iFs2fLLfnZyuDc2 uj2h0Vc9iVJhaQmR6XF0QEy2RYvwAgrSBSzf6OZJSipJKX13jsFGUhN1ePttbEV6nbHDDu oIRjHb5IVlPO9XpyiSr55GvzG0X2bGSqoYYIaAJ31MsnTCJbrI/WgnIEFSFKyOusDoEuBD Ee2eVSlsL0OzfhdqZSV+bbH7WaqC/eaWcaPzU8bUQyHbOO03jxv1JuatY5/BJA== 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 4bcJxp6MLMz108b; Wed, 09 Jul 2025 00:38:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5690cs4o004439; Wed, 9 Jul 2025 00:38:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5690cssx004436; Wed, 9 Jul 2025 00:38:54 GMT (envelope-from git) Date: Wed, 9 Jul 2025 00:38:54 GMT Message-Id: <202507090038.5690cssx004436@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 6750c124c71c - stable/14 - md: Restore guards in mddestroy() 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 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 6750c124c71c83eb6c4a6a349572ec24d7668441 Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=6750c124c71c83eb6c4a6a349572ec24d7668441 commit 6750c124c71c83eb6c4a6a349572ec24d7668441 Author: Mark Johnston AuthorDate: 2025-07-03 13:10:49 +0000 Commit: Konstantin Belousov CommitDate: 2025-07-09 00:28:29 +0000 md: Restore guards in mddestroy() (cherry picked from commit 5ae9f8e9ac5e1307fed4f7f2549347576f01b3fa) --- sys/dev/md/md.c | 25 ++++++++++++++++--------- 1 file changed, 16 insertions(+), 9 deletions(-) diff --git a/sys/dev/md/md.c b/sys/dev/md/md.c index e89c5e858c32..95926706443b 100644 --- a/sys/dev/md/md.c +++ b/sys/dev/md/md.c @@ -1561,19 +1561,26 @@ mddestroy(struct md_s *sc, struct thread *td) mtx_destroy(&sc->queue_mtx); switch (sc->type) { case MD_VNODE: - vn_lock(sc->s_vnode.vnode, LK_EXCLUSIVE | LK_RETRY); - sc->s_vnode.vnode->v_vflag &= ~VV_MD; - VOP_UNLOCK(sc->s_vnode.vnode); - (void)vn_close(sc->s_vnode.vnode, sc->flags & MD_READONLY ? - FREAD : (FREAD|FWRITE), sc->cred, td); - kva_free(sc->s_vnode.kva, maxphys + PAGE_SIZE); + if (sc->s_vnode.vnode != NULL) { + vn_lock(sc->s_vnode.vnode, LK_EXCLUSIVE | LK_RETRY); + sc->s_vnode.vnode->v_vflag &= ~VV_MD; + VOP_UNLOCK(sc->s_vnode.vnode); + (void)vn_close(sc->s_vnode.vnode, + sc->flags & MD_READONLY ? FREAD : (FREAD|FWRITE), + sc->cred, td); + } + if (sc->s_vnode.kva != 0) + kva_free(sc->s_vnode.kva, maxphys + PAGE_SIZE); break; case MD_SWAP: - vm_object_deallocate(sc->s_swap.object); + if (sc->s_swap.object != NULL) + vm_object_deallocate(sc->s_swap.object); break; case MD_MALLOC: - destroy_indir(sc, sc->s_malloc.indir); - uma_zdestroy(sc->s_malloc.uma); + if (sc->s_malloc.indir != NULL) + destroy_indir(sc, sc->s_malloc.indir); + if (sc->s_malloc.uma != NULL) + uma_zdestroy(sc->s_malloc.uma); break; case MD_PRELOAD: case MD_NULL: