From nobody Tue Oct 06 07:51:09 2026 X-Original-To: dev-commits-src-branches@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 4hzT315jgnz6cWHL for ; Tue, 06 Oct 2026 07:51:09 +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 4hzT311bQjz4GYP for ; Tue, 06 Oct 2026 07:51:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1791273069; 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=kh1Iw9cGBByDBL2gBjSrXvkeYQ3h9Cxq4zZjLiHrOgc=; b=qGGSCgI2kAQlii9fomRQJIv7AEM9oWbSPLQURAPCzfDjeftGghp8asbFmu7aIj8AT4sX6h pewpWhrLoAgN9AQjs/8Kp3H+7m8tjTvjVKLlTOpuui0diu0rQ4c92qe0sLZ5xLtaVnn6jE Ts0QYOlIEUGolWa025NhjTP7XISud5bCvaGOQU5msIIWGjQAbMxKoE/LPIjeJ3FKtgdTCC ykxm1tBf95BDczSSJiwPOcwRM++6IhzeUGXqNRvagL7AQFXGK1OQ3O9MvEWxwBpi2pKAAa RUkwl4R4WgPQ74Qqfdekb+D26uZzJij/tje9ihmX2kwKCpy1FKyt7uGPww3EVA== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1791273069; b=w63KVbcconexJl2Xkt43OUasL3xO5ltyjYzzWANS5zude8rnYrOQwmrzPTOhmcBw/Nz8nO i8YpvPFaY1s7fQkqoLTIH8daIxO5M5XWIa/xq7m5juXoOz0BXZGzlIwvLApinwxZMn2yC4 7oVL7C+RrVCWidZD+i/IO3JJaUmsRXdvsfo0+vqRP5bEIJYiDlds9OuPcvf8viwDDKzyGw WQElSqNQF7kyDzvbYteF7ax+boTACWrNn1uCMx2fNoSuiTO8J5HiVBYOVsQlR5LLzNqLND r47MxBP9mZD966OKqSV89p1Y84CgANOPhszIsnfkUzE5bF0KGhy4t7/QRdWWhg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1791273069; 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=kh1Iw9cGBByDBL2gBjSrXvkeYQ3h9Cxq4zZjLiHrOgc=; b=LA2IWZZl4c1uKkFYAPr0E/Av43uwZn9Tj494D6hzDTsBHXm6b4m5RiG2NrnQB8kN2xg4O7 aGUTv3vAaAP/XQSO0oWiSGr6I8Y/7EJ+bnP21a1pgZS13207Xl4oQlXs91c6/Hbpg2fO9K 3Vzx0R57q+noMcOCDtXXeNYbvTGoOKPIWHiD5C7qXJnhEtlhiv/pExdzZfPWl/NwsEWahe b/haxRECmKBcvLeq2mENNG18DTmjobo+k2IvDoUovRN2RKwpX874a9hICRmnVIvGilXXgE fWhbIrzAWtCd5MQPOTAHyCB3057VN8uUu4PG7r4Z3UMTKrxKB0qi7x+myPP26A== 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 4hzT310XvMzx04 for ; Tue, 06 Oct 2026 07:51:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 19051 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 06 Oct 2026 07:51:09 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Jaeyoon Choi Subject: git: 6b85b8e923ae - stable/15 - ufshci: tolerate partially constructed queues in SDB teardown List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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: 6b85b8e923ae55ca57c15eb46103a2a35cdc3ef4 Auto-Submitted: auto-generated Date: Tue, 06 Oct 2026 07:51:09 +0000 Message-Id: <6ac4a86d.19051.c44ae2d@gitrepo.freebsd.org> The branch stable/15 has been updated by jaeyoon: URL: https://cgit.FreeBSD.org/src/commit/?id=6b85b8e923ae55ca57c15eb46103a2a35cdc3ef4 commit 6b85b8e923ae55ca57c15eb46103a2a35cdc3ef4 Author: Jaeyoon Choi AuthorDate: 2026-08-10 01:42:16 +0000 Commit: Jaeyoon Choi CommitDate: 2026-10-06 06:27:57 +0000 ufshci: tolerate partially constructed queues in SDB teardown When attach fails, ufshci_req_sdb_destroy() runs on a partially constructed queue, and it runs twice: once from the construct error path and once from the controller destructor. Make that safe: NULL-check each resource before freeing it and clear the pointer afterwards, so a second call finds nothing to do. The construct error label no longer frees the command descriptors itself, which fixes a double free of ucd_bus_addr. Also destroy the payload DMA tag, which was previously leaked. Drop the mtx_initialized() checks: the locks are always set up before any failure path can reach the destroy. Attach can also fail before the queues were constructed at all. The destructor would then call a NULL qops.destroy pointer, so skip the destroy when the queue was never set up. Sponsored by: Samsung Electronics Reviewed by: imp (mentor) Differential Revision: https://reviews.freebsd.org/D58660 (cherry picked from commit 24c2ead33b44ca5db2605b462c935236f3a73443) --- sys/dev/ufshci/ufshci_req_queue.c | 8 +++++++ sys/dev/ufshci/ufshci_req_sdb.c | 44 +++++++++++++++++++++++---------------- 2 files changed, 34 insertions(+), 18 deletions(-) diff --git a/sys/dev/ufshci/ufshci_req_queue.c b/sys/dev/ufshci/ufshci_req_queue.c index 371b9c520979..d8d86070c18c 100644 --- a/sys/dev/ufshci/ufshci_req_queue.c +++ b/sys/dev/ufshci/ufshci_req_queue.c @@ -72,6 +72,10 @@ ufshci_utmr_req_queue_construct(struct ufshci_controller *ctrlr) void ufshci_utmr_req_queue_destroy(struct ufshci_controller *ctrlr) { + /* Attach may fail before the queue ops are set up. */ + if (ctrlr->task_mgmt_req_queue.qops.destroy == NULL) + return; + ctrlr->task_mgmt_req_queue.qops.destroy(ctrlr, &ctrlr->task_mgmt_req_queue); } @@ -114,6 +118,10 @@ ufshci_utr_req_queue_construct(struct ufshci_controller *ctrlr) void ufshci_utr_req_queue_destroy(struct ufshci_controller *ctrlr) { + /* Attach may fail before the queue ops are set up. */ + if (ctrlr->transfer_req_queue.qops.destroy == NULL) + return; + ctrlr->transfer_req_queue.qops.destroy(ctrlr, &ctrlr->transfer_req_queue); } diff --git a/sys/dev/ufshci/ufshci_req_sdb.c b/sys/dev/ufshci/ufshci_req_sdb.c index cc99b645331c..c7bf033ddc37 100644 --- a/sys/dev/ufshci/ufshci_req_sdb.c +++ b/sys/dev/ufshci/ufshci_req_sdb.c @@ -22,10 +22,16 @@ ufshci_req_sdb_cmd_desc_destroy(struct ufshci_req_queue *req_queue) struct ufshci_tracker *tr; int i; - for (i = 0; i < req_queue->num_trackers; i++) { - tr = hwq->act_tr[i]; - bus_dmamap_destroy(req_queue->dma_tag_payload, - tr->payload_dma_map); + if (req_queue->dma_tag_payload != NULL) { + for (i = 0; i < req_queue->num_trackers; i++) { + tr = hwq->act_tr[i]; + if (tr->payload_dma_map != NULL) + bus_dmamap_destroy(req_queue->dma_tag_payload, + tr->payload_dma_map); + } + + bus_dma_tag_destroy(req_queue->dma_tag_payload); + req_queue->dma_tag_payload = NULL; } if (req_queue->ucd) { @@ -42,6 +48,7 @@ ufshci_req_sdb_cmd_desc_destroy(struct ufshci_req_queue *req_queue) } free(req_queue->hwq->ucd_bus_addr, M_UFSHCI); + req_queue->hwq->ucd_bus_addr = NULL; } static void @@ -145,7 +152,6 @@ ufshci_req_sdb_cmd_desc_construct(struct ufshci_req_queue *req_queue, return (0); out: - ufshci_req_sdb_cmd_desc_destroy(req_queue); return (ENOMEM); } @@ -297,24 +303,27 @@ void ufshci_req_sdb_destroy(struct ufshci_controller *ctrlr, struct ufshci_req_queue *req_queue) { - struct ufshci_hw_queue *hwq = &req_queue->hwq[UFSHCI_SDB_Q]; - struct ufshci_tracker *tr; + struct ufshci_hw_queue *hwq; int i; + if (req_queue->hwq == NULL) + return; + + hwq = &req_queue->hwq[UFSHCI_SDB_Q]; + mtx_lock(&hwq->recovery_lock); hwq->timer_armed = false; mtx_unlock(&hwq->recovery_lock); callout_drain(&hwq->timer); - if (!req_queue->is_task_mgmt) - ufshci_req_sdb_cmd_desc_destroy(&ctrlr->transfer_req_queue); + if (hwq->act_tr != NULL) { + if (!req_queue->is_task_mgmt) + ufshci_req_sdb_cmd_desc_destroy( + &ctrlr->transfer_req_queue); - for (i = 0; i < req_queue->num_trackers; i++) { - tr = hwq->act_tr[i]; - free(tr, M_UFSHCI); - } + for (i = 0; i < req_queue->num_trackers; i++) + free(hwq->act_tr[i], M_UFSHCI); - if (hwq->act_tr) { free(hwq->act_tr, M_UFSHCI); hwq->act_tr = NULL; } @@ -331,12 +340,11 @@ ufshci_req_sdb_destroy(struct ufshci_controller *ctrlr, hwq->dma_tag_queue = NULL; } - if (mtx_initialized(&hwq->recovery_lock)) - mtx_destroy(&hwq->recovery_lock); - if (mtx_initialized(&hwq->qlock)) - mtx_destroy(&hwq->qlock); + mtx_destroy(&hwq->recovery_lock); + mtx_destroy(&hwq->qlock); free(req_queue->hwq, M_UFSHCI); + req_queue->hwq = NULL; } struct ufshci_hw_queue *