From nobody Sun Apr 27 18:38:09 2025 X-Original-To: dev-commits-src-main@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 4ZlwLp32B9z5vB86; Sun, 27 Apr 2025 18:38: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZlwLn5RX6z3GbR; Sun, 27 Apr 2025 18:38:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1745779089; 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+gDrMOzp7iKdCbdP5T5BebDI6B5AaGjEwigKlQPDWQ=; b=A3xl51ja0SXxtlN6GT9PxwKuEEdQPzgm7C85SR2+GApa/aAsiGN0ySSVQMmqvUatGe9wx+ 6onS1kB1F3R9zdZHrTknBFXVyBxrHh84v226lbDDiAg7/dTEbvHUThKkLmTL5hnRvOv9X2 UwIOJmcLBwSBVvGXD5KIpokON7v7Vfzbwv4naX4sBfjd55nlE7sTkIwxR4Pg7+VQiEtyp8 15whzaQsp8ZSYpQKMDDbnUIkp7OPKUx3CwAVBYadfl0NcDOb+zdgz5nO1HhBshVTvcrA7D ITvCASQOldrONQZ8aa6irv79GCDel/kFPLfayytw2Bgb0yd3in956UjsxN3S9Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1745779089; a=rsa-sha256; cv=none; b=pPgec9l1w1G81M8uXbKinqIDB7j5OFL0emIQA9SJc9e3pAAA1e+LcVNhKnl8+XNHf52I7s KzRASQW7cH8pbKwXrqSXS0clEWLjfoYGV53pHDtwm/Y3Oi3V6sUAyD4clwojMJO7Q08H79 R2asr+cLabRr001Gw2aYh161/hElRszkpYzKNZ19iDrLmBbwWAKmifi+A6fza3A2SGoUdz ah4fj73EFB16xnN8kPNIQ5Vf/zNLZ/Ux7DfcrY9CElbIWtRJR6iNkijHgndfHPQVuTNIQU 7S1KEEvX8oEkewv7D4PhjxcK1rL/1SeuWbOsvxAthVEjK+Nn/Ucf0Or/CsS7cg== 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=1745779089; 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+gDrMOzp7iKdCbdP5T5BebDI6B5AaGjEwigKlQPDWQ=; b=YKW6W8bh1peNpDb3bKnzO8h3RT1fPFCmXp0tUdDzTvPCsOqfXpcdRUm6bKXD6BOzb/2xzI ndrhQypJ+lnIgZaYA/rgFaS7s8TUxCpUISs0p6hOUHeMtfR9xbjJmtcOgozrgTSXxi4OMI gIvDoDwT4mVM6ei1kSPA8iJCJyaapzGQSMHpvhmzk93U+meIxMvHY1aqTbLKC20/3+VcRe YFJM/6qGS2YTKeTnGH7pQDLEgGHe6Fo/lfgNJCGZTuMrN3qnYe+KPkggANSA/NBLav3Lts izEwpLxi261WvUU1EfoQM4bqSFwm+x/uWNm6BFJWgDcCzGM71e7KjDKiPhDqaw== 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 4ZlwLn4Ds9z1Gbf; Sun, 27 Apr 2025 18:38:09 +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 53RIc9JY020568; Sun, 27 Apr 2025 18:38:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 53RIc9tx020565; Sun, 27 Apr 2025 18:38:09 GMT (envelope-from git) Date: Sun, 27 Apr 2025 18:38:09 GMT Message-Id: <202504271838.53RIc9tx020565@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Adrian Chadd Subject: git: af298663e9ff - main - e6000sw: unlock the driver lock in the error path during attach List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: adrian X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: af298663e9ff77e3a03da10d89d89e73a69a9ea7 Auto-Submitted: auto-generated The branch main has been updated by adrian: URL: https://cgit.FreeBSD.org/src/commit/?id=af298663e9ff77e3a03da10d89d89e73a69a9ea7 commit af298663e9ff77e3a03da10d89d89e73a69a9ea7 Author: Adrian Chadd AuthorDate: 2025-04-25 18:38:20 +0000 Commit: Adrian Chadd CommitDate: 2025-04-27 18:04:39 +0000 e6000sw: unlock the driver lock in the error path during attach The driver sleep lock was being held during most of the error paths, and not unlocking it will panic the kernel during detach. So, fix it. Differential Revision: https://reviews.freebsd.org/D50029 Reviewed by: imp --- sys/dev/etherswitch/e6000sw/e6000sw.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sys/dev/etherswitch/e6000sw/e6000sw.c b/sys/dev/etherswitch/e6000sw/e6000sw.c index 59ac05d99ae3..85900cebc303 100644 --- a/sys/dev/etherswitch/e6000sw/e6000sw.c +++ b/sys/dev/etherswitch/e6000sw/e6000sw.c @@ -650,6 +650,7 @@ e6000sw_attach(device_t dev) return (0); out_fail: + E6000SW_UNLOCK(sc); e6000sw_detach(dev); return (err);