From nobody Sat Apr 20 16:05:08 2024 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 4VMGYw71Jkz5J35W; Sat, 20 Apr 2024 16:05:08 +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 4VMGYw5mGkz4tMX; Sat, 20 Apr 2024 16:05:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713629108; 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=qF1DEfjhf45DyK4lU3W6Hrb+N0ejM1LLel8SdD46RMQ=; b=Hwk54YrlvRI1WOPrxND3YhvpbwzVB5fW0Ozms7/UowIKj7ULIxnz8Ww720IfHObpJ5lxw5 GF0NrLyAEm5Ft41xfVBMeuz49ofp08HAaT+u3sWRjUN/eX2Ek+C2SYgRIBcdn8tsdvuQim FwF8woqmGVPPkT+uoMMoibswCXUdQ9ByVLqQuGrffgWfTBhdN4EIKOTNs34XIZk6ZTpio2 7AKg8cuIMHvl4P9L5GojtDU01SwU/hJZl0mvvRnofWev7G4cF+TO1iPjaJomMuvMTFK570 PZbraOkunXNcjEzYD8U55BwPWuXEYoFPTGLFc/SqtjOP7lzDpdThMg3mhR2V4w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713629108; a=rsa-sha256; cv=none; b=yIfc0x1CASPZYone/e4HgoyphuT3Sg2XvpKkUhBvldOgfBTVHzQ7CwbBBxiynkEgNHGcyo zLPZit6a3qTURosQnv9qYo7jY7fsuwAsAtCb1BFH19jsfHTcjrdmHm9PfOEnwB59+uQDZ+ hU2YDIjS423l9bQFrLD26P1uUWtcGJmM4R2aFuW2zHeqX2lmg/7n17Q4x/6r09klmW4Tnb i+TPX2yLH3yH65bk+NVyb6k1iIbMQ1o+r7K2eTQY0nGiP+ESSSC+BhKkPVFuLz21TcW3O6 QRbEVFZvSIovdJ810TYErxMKZNZ3npUbVrCxgexow46WafloOYUi8BiR+IxGMg== 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=1713629108; 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=qF1DEfjhf45DyK4lU3W6Hrb+N0ejM1LLel8SdD46RMQ=; b=aGUDLyeW0Oej4Ypo5BPMR747RQNiOZylUWCUehNmtLwCQTUHrkbp7TqkOzK5qrX4H2aEcm yYVXP5a09KEFM1UZvDfM5krDJucQvhi5Rx3hh4Meus4S9bVb5oUs9HE1Xq6Hv5BH0l+LSu psyZaogcbx5lV+B6id/yE2vJ0IR3Ked+uJOg55jjeI8l+y8Cd8FLuKS5CPJjMA7Kg0Jd0Q wCGIw9nwLNu9MeahOsKfofrc/Yl6ju4zQTa9f33I5zffg6wxDrReCG/gIL19phEAPvZVvN nc883l3nAfRvi0fTCnFV3SGlDGoN523roEn/6IDNWIV3UJnqoCC98DbY2m3Bjg== 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 4VMGYw5HQbzkQp; Sat, 20 Apr 2024 16:05:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 43KG58ZT080333; Sat, 20 Apr 2024 16:05:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43KG582x080331; Sat, 20 Apr 2024 16:05:08 GMT (envelope-from git) Date: Sat, 20 Apr 2024 16:05:08 GMT Message-Id: <202404201605.43KG582x080331@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: 955f213fa2f1 - main - graid3: Fix teardown in g_raid3_try_destroy() 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: 955f213fa2f14d5b5e9b655d8922e28315eb9fa3 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=955f213fa2f14d5b5e9b655d8922e28315eb9fa3 commit 955f213fa2f14d5b5e9b655d8922e28315eb9fa3 Author: Mark Johnston AuthorDate: 2024-04-20 16:02:06 +0000 Commit: Mark Johnston CommitDate: 2024-04-20 16:04:57 +0000 graid3: Fix teardown in g_raid3_try_destroy() Commit 33cb9b3c3a22 replaced a g_raid3_destroy_device() call with a g_raid3_free_device() call, which was incorrect and could lead to a panic if a RAID3 GEOM failed to start (e.g., due to missing disks). Reported by: graid3 tests Fixes: 33cb9b3c3a22 ("graid3: Fix teardown races") MFC after: 3 days Sponsored by: Klara, Inc. --- sys/geom/raid3/g_raid3.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/geom/raid3/g_raid3.c b/sys/geom/raid3/g_raid3.c index 721610cefbec..c2d05b48d80d 100644 --- a/sys/geom/raid3/g_raid3.c +++ b/sys/geom/raid3/g_raid3.c @@ -2033,7 +2033,7 @@ g_raid3_try_destroy(struct g_raid3_softc *sc) sc->sc_worker = NULL; } else { g_topology_unlock(); - g_raid3_free_device(sc); + g_raid3_destroy_device(sc); } return (1); }