From nobody Tue Apr 23 13:52:17 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 4VP3TG3pVpz5HJ0l; Tue, 23 Apr 2024 13:52:18 +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 4VP3TG1mk9z4nCb; Tue, 23 Apr 2024 13:52:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713880338; 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=9+Ke1GAFpKVI9uJfqeYkWd8Axv2H2I/2LZ5JT2Zhv2M=; b=Ja/YyBh008AV4lSFWaDb+1EnpY2BQwAXWRPGRwIP8VnlkVB0G4VjQc0cCvJ+OFHWCYeIqz VUdBF4zI68Wgz/Q6sYVG5dDDWuiO42aYof9HxwSlvhw75tXuX3zo4Lk4jftOF4RDoQvypJ QWmuWYfMtPRFf5ekjuLNvotsMrwX1t6VX5kuOZVkBcVAaCBb9ofhLeXuKa6E/kMDxwQVIP l94gsiiKp9k5GGcGA0+b3DUeztTixTsUbMqQA2oMa/JjKM6ijIIGmxqav2j2EBmjw6ne3c oDucOZiJbX1SXb2SdKCPp4TaBJ7vbztqBWqeQ53CIuHOaq5/LNGI0Ajol1uNuA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713880338; a=rsa-sha256; cv=none; b=UxpS4hrqYHTw/4QNRuzMkeBgNIWpNXE1bXKgCtSLzlusHlMkTNiqYnftH/V8g6VGr/DtHD 5jQFdR9Jx1Cgsq8W5l9fx8lP5u7HXtlEQ443ergi7XghjwhgheIcZN51+GU/lTlBJglgTd hju4o8wuoJ9jkBpUq6QwBWql84HF9p+ZKxc3AHW9Gq/Bl24VrfwKXTEoSgSjfj6BYsAXhw sMpzp7abAGI1aFIG0H8D4s3ufGOhPXDD0cPCa8BKqkqcVIOcYMt+jdTW/fW329sOv3UxVn 1KUQTlhyvIJhf+zUkDG3zJHqm8rUmKULg/7B4blreMWJQPFBAHphd6OHhJbH4Q== 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=1713880338; 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=9+Ke1GAFpKVI9uJfqeYkWd8Axv2H2I/2LZ5JT2Zhv2M=; b=amxyXMSwrIftFmtIzt3BmPJ2CJ/qGrwaW0q268R4A4kv3rPoCK6uo1CkpHJT1IdO4KjzzS GU9IcL2Rz40QAMOIHqRj02QeKhOt8f9bINPr9kSs7SUH08eQLbJFZgUpx/lAy+PG3Wx9vx 5zx83n6RsLEg+CZld/7pblvR6MSJmspHTi/fQu2K3Td/YE+Zreq+ZvUlsTetVyn3ZInJEK pwE+05OczV/moWizVALVZGGCPV6xQHkKzRU7cKlvGkVXoyLHvsZFxu+BHrmAF8LNKK5eA7 SLnQaa8DaH3/iuX+1F2SGVIVeKUJBfOajdEL2yvbFDr7NuK7tZPBdWNIpXxojw== 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 4VP3TG0hNZzZXF; Tue, 23 Apr 2024 13:52:18 +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 43NDqHi3082042; Tue, 23 Apr 2024 13:52:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43NDqHAe082039; Tue, 23 Apr 2024 13:52:17 GMT (envelope-from git) Date: Tue, 23 Apr 2024 13:52:17 GMT Message-Id: <202404231352.43NDqHAe082039@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: 692106afb8a8 - stable/14 - 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/stable/14 X-Git-Reftype: branch X-Git-Commit: 692106afb8a8d6ff82d8d780a1ebdd9ffd74fd11 Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=692106afb8a8d6ff82d8d780a1ebdd9ffd74fd11 commit 692106afb8a8d6ff82d8d780a1ebdd9ffd74fd11 Author: Mark Johnston AuthorDate: 2024-04-20 16:02:06 +0000 Commit: Mark Johnston CommitDate: 2024-04-23 13:51:33 +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. (cherry picked from commit 955f213fa2f14d5b5e9b655d8922e28315eb9fa3) --- 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); }