From nobody Thu Jul 3 15:20:36 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 4bY0nx36PXz61DPk; Thu, 03 Jul 2025 15:20:37 +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 4bY0nx1MLhz3Lh9; Thu, 03 Jul 2025 15:20:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1751556037; 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=oUHmN7J+HggbzCzE+sa8zIq110RGxhGFSpxzWBkDaLk=; b=CmWPR/CrgL+1PT+sYl6/F3gVZFlmFDt0EBZgFiX+9rtiu4miwqsGkWIenb+DW94w9g6EMC c2GExxXfBvbW1fCx3A9TqDdtZrsY+weYt4EbfrO+6sZMH7iV6TVYym1frMGAMGTWbwebmB 1XG0gVKrnzYrGG6hkm40iyRnmZjyMUGgbh9kta5O5OhKdxQLg4Ztmshe6tfrmG6T1Wn2lM 8i5DrmtC5FGa0iO+7VBU9uPpRU9JREPEWajP0BAqWs8DvPjnc7gpUf5h0BYFWHZwOLAvXQ vEXyNfdJYzrmzGr6VxtWymfKFDe3KJzW+GAdOtByk6/ysVnAk2mYwZcJVtvOqA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1751556037; 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=oUHmN7J+HggbzCzE+sa8zIq110RGxhGFSpxzWBkDaLk=; b=jXUWvE0+ep0kvkzneSs4AwbadGO+keWyaBd7Cl46ybylNjPWtcRvVekTEQJTzxbpPLzWsF iuCv6csEC5F3UAzQAWD71KNAAeXifI7bav4+dEZ8rF4oEdP3I7SKFBmJk/LPtfwVovdm2c v7dj2uaGdK7C57Z1C7qKTqvFKboyBrj5cDNAIKE3OE0yawsf7w7eexZPCasZdKGceKMC0/ eqEmA4KIiOawl2mTVtG+Q9vvJvHE7dugPlr9RfOOx/14p9EOhcPKkvrjapuYYcz18s4Hue 0SLMMTKtC9qnnDU+xnTYWDobQ7JqDhr8F6SjcKgvXn0o0+ftFlsgyV2dCCzn6A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1751556037; a=rsa-sha256; cv=none; b=Gc0fY9Ov/pxJnB6tZkr9RKgk+/4fHnrIre0ibHGYRrZdRJQE2QR2dQldoFkfD7AHg8E2RA 2YzGQITUFKNCTte4a+s2oLzaHlhf2gVQi+PzOz48uO+bF4LedjO6znYo87EHtl+Gg6Veaj 58xuwF7TGnC6U1gBp9USY7aVyuE7fpbbLQgzLGUq2h5rtmBPQdayY+LoAKbdTzsiR4naZL XT9AsaeKu/OVSXpxnxrkA76/sf72PZrwCL1WPCstEUIWjNNfAfDsu1oJy2I1CuzXGB+3uq SCLlxQqYT7wTLBoOCRtIb2eqAwzPnR0Vzndh4Oi0N1MLRKUYFES8ZDkh9FIx+w== 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 4bY0nw6WKWz18kY; Thu, 03 Jul 2025 15:20:36 +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 563FKa60024809; Thu, 3 Jul 2025 15:20:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 563FKa9n024806; Thu, 3 Jul 2025 15:20:36 GMT (envelope-from git) Date: Thu, 3 Jul 2025 15:20:36 GMT Message-Id: <202507031520.563FKa9n024806@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 5ae9f8e9ac5e - main - 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: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5ae9f8e9ac5e1307fed4f7f2549347576f01b3fa Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=5ae9f8e9ac5e1307fed4f7f2549347576f01b3fa commit 5ae9f8e9ac5e1307fed4f7f2549347576f01b3fa Author: Mark Johnston AuthorDate: 2025-07-03 13:10:49 +0000 Commit: Mark Johnston CommitDate: 2025-07-03 15:10:41 +0000 md: Restore guards in mddestroy() mddestroy() may be invoked on a partially constructed md device. Restore the guards that handled this prior to commit e91022168101. Reported by: syzbot+a0ff73f664de8757cfaa@syzkaller.appspotmail.com Reported by: syzbot+7b4a4824bf81548283ab@syzkaller.appspotmail.com Reviewed by: kib Fixes: e91022168101 ("md(4): move type-specific data under union") Differential Revision: https://reviews.freebsd.org/D51145 --- 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 b842d4f2fd8e..741a7c013f7d 100644 --- a/sys/dev/md/md.c +++ b/sys/dev/md/md.c @@ -1559,19 +1559,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: