From nobody Tue Oct 06 07:51:11 2026 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 4hzT334swgz6cWL1 for ; Tue, 06 Oct 2026 07:51:11 +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 "YR2" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4hzT333dqWz4Gk2 for ; Tue, 06 Oct 2026 07:51:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1791273071; 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=d+yFBpEZcn8ODALRmrXxFuI8WG9AX+ZixD8SvBui1qc=; b=GuZhO35e1ZcIJg+GU2nlIFC7qUWKJtk84xXtsz36s0K0YlleTGUV4/s+EiKYEFam8k0Cvd 7n5Iwd7bsno5jeAoopC0xAEG0qrfkqAWBg9o14ZX7zay8QxP29rrMsmoCivJhpiHvmnJF3 ViCSa+MSXEL39o7QvSyKY6ix/l77Eg7elMTaBnCWu6QuYyVBXpNOZInC1SSAWPH1q/ZqeO gIcV6a2Q6Obve1Mz0dSepv0KYqgvTbcJIKcEEHsoOPfGuPt8ltdRJYbexGQeK2gS0USuhU sC1oGYRlwqdhe29ZRpwXQjOSvY4KRif3bRg22SLi7paLzuoduR+lCrwMtA3iMg== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1791273071; b=c6gZffqJS7AiWihvkALFB3PjN40bwgCnt9R5uYvfMMsc9JuPHZjzZOVEAYexOwJugYgm8m qEmLg1tBnmZRIWZ3deC4gTMQUd0yUjpHDe4fyh3Q8hIditwsbHgukNNxZQoby60veyLxRJ PRhWvGnodR/EWx8nSufWZ8bc9/wbpa1TJEkTBCRPeqzz6bpmpjNL5mzoCXVhx+sW2MiwNq NwbTQfqjBfs5eDJEPlN4ASnKmGSuh7zcEpabVHbxYkV+FBv8M7XQ8oUQp2SanCwJuwzvZz A9jz0k4bC6LQossgGz1BHWLkfbFOzogiiMsR0VCa/P+jNrw5UorLS/oDOq9dZQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1791273071; 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=d+yFBpEZcn8ODALRmrXxFuI8WG9AX+ZixD8SvBui1qc=; b=NmnlaWALWHomM8fKUIUSDpRKGbtcctR3uG47ap2/Mq5SVvWBcRIPCgUnmC8tdEhbrzjg5G MOPbtf+KvXrh1CbykMrnRFKd+DkjmU0t8972e6xZ1CNzRKedCu7PzbvR6Dv25WB53cv2Ko lW/pzKK7onzELAV4vqItUdc3GnpGaEEcLoh8ymTsvOw1VmeWobk7BYD+GOshuSGne0B4Ed z4VSmwlx1/h5w/AT+wuNbVOeLGtCmnkB6EWdvnnOOToVgL6/OLEWRyI3wxzk0cSEX6Ht1U V/ijjCD07Ezl5NT9YbEgsAVyd/KR3SxeKbRgeLV54WE0f+oeKIC9iYHaoa2tQw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hzT3329wpzxqv for ; Tue, 06 Oct 2026 07:51:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 475bc by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 06 Oct 2026 07:51:11 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Jaeyoon Choi Subject: git: 5f7c2adceb5c - stable/15 - ufshci: do not free the devq twice on SIM attach failure 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 List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jaeyoon X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 5f7c2adceb5c3df28a24e8c6f0287f4a5b640263 Auto-Submitted: auto-generated Date: Tue, 06 Oct 2026 07:51:11 +0000 Message-Id: <6ac4a86f.475bc.5f5756cd@gitrepo.freebsd.org> The branch stable/15 has been updated by jaeyoon: URL: https://cgit.FreeBSD.org/src/commit/?id=5f7c2adceb5c3df28a24e8c6f0287f4a5b640263 commit 5f7c2adceb5c3df28a24e8c6f0287f4a5b640263 Author: Jaeyoon Choi AuthorDate: 2026-08-10 01:44:35 +0000 Commit: Jaeyoon Choi CommitDate: 2026-10-06 06:27:58 +0000 ufshci: do not free the devq twice on SIM attach failure cam_sim_free() with free_devq set already frees the devq, so the following cam_simq_free() call on the xpt_bus_register() and xpt_create_path() failure paths was a double free. Also clear ctrlr->ufshci_sim so a later ufshci_sim_detach() does not operate on the freed SIM. Sponsored by: Samsung Electronics Reviewed by: imp (mentor) Differential Revision: https://reviews.freebsd.org/D58662 (cherry picked from commit c71705a0830497c080579896b4aa2a5ce2513f1c) --- sys/dev/ufshci/ufshci_sim.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/sys/dev/ufshci/ufshci_sim.c b/sys/dev/ufshci/ufshci_sim.c index 9d80dd195ad9..4a106a6c7b8a 100644 --- a/sys/dev/ufshci/ufshci_sim.c +++ b/sys/dev/ufshci/ufshci_sim.c @@ -371,8 +371,9 @@ ufshci_sim_attach(struct ufshci_controller *ctrlr) mtx_lock(&ctrlr->sc_mtx); if (xpt_bus_register(ctrlr->ufshci_sim, ctrlr->dev, 0) != CAM_SUCCESS) { + /* cam_sim_free() with free_devq also frees the devq. */ cam_sim_free(ctrlr->ufshci_sim, /*free_devq*/ TRUE); - cam_simq_free(devq); + ctrlr->ufshci_sim = NULL; mtx_unlock(&ctrlr->sc_mtx); printf("Failed to create a bus\n"); return (ENOMEM); @@ -383,7 +384,7 @@ ufshci_sim_attach(struct ufshci_controller *ctrlr) CAM_LUN_WILDCARD) != CAM_REQ_CMP) { xpt_bus_deregister(cam_sim_path(ctrlr->ufshci_sim)); cam_sim_free(ctrlr->ufshci_sim, /*free_devq*/ TRUE); - cam_simq_free(devq); + ctrlr->ufshci_sim = NULL; mtx_unlock(&ctrlr->sc_mtx); printf("Failed to create a path\n"); return (ENOMEM);