From nobody Tue Oct 06 07:51:10 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 4hzT324vQFz6cW6r for ; Tue, 06 Oct 2026 07:51: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 "YR2" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4hzT322sbVz4GKy for ; Tue, 06 Oct 2026 07:51:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1791273070; 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=pZ+Zy4uT+FAQMgVTwFR5u5rqfEIqve44CtxTBQyz9Ss=; b=EtjqaRpNQ//3HDHQRIWBo/HUncyohnqkUyaic5RtyovVQEBPhQg2GDeLbUE/ZpQvrG/AB1 GVHidkHgS3ar8qFOPlLTu/rVadK6XKUufW9O++YOQvXsXsQZHHlSDzfykHSbrBmO2pePyi kgd9fy7xijYyFmVNGluKNaKdJQ75uShmPysOZVVzgU8Vuc7MgqfpAR60EyIwOaGEhbf8Eu cwKyP2bwZuj9/8p5UWnQuvxnHGe5WpdIKavLKdLnRdqE9vbbMCDI4kpk+fOLtgfx5Z1lj5 Idc4go8rDEHtYPa3cav9+y0EbDnodOuJ2ZIuJ8vrRutnF8jA0YgqUKBGQksrLw== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1791273070; b=ktdHdh9toawT6kdl/geXEO+E8eQchK33GGtmDONcuZrkNemd8d+qJZSl16QdJr+CtMiQ0k zL3+yGk1EMJGrCV9k7UbHmZSGmZVbdWcWyzPgwoHJakMN26miW2qbFxg8kGvG6ZmVsMO05 kw3e1Vr/YSj1wuQXMEqaVwgFRO5SQhlCQBYmiBHYJ+TLUXGYKHzeIYFpvZh7jlk+9ilBgb pDBqMVKVSRia1u71bjFZEu6ZCaO3Btdt3QWgxy/kiAEHdmj9Vq/9ed8mv76tbYLyFmC1zL axRMzaQeN7WrDkR6UOwyGFLi2fNsjWXB4qcXHp2PjR8F3ToNszfFWdjE9C++Qg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1791273070; 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=pZ+Zy4uT+FAQMgVTwFR5u5rqfEIqve44CtxTBQyz9Ss=; b=m7MOXhGvmRGhapvJQMs506lZlTKGJS+15RgkpvsVWR0SwVZDm9tG8ljq8vwzKQaZkKHBCw tREZ4ZmfZwMri0VTbiNpgQCxh6FyMbXXuRLpmC8MbmxfGNbOtTdAEJSGHW3ZZxyrtiSF+k Ma5SyauxruNaQWSm7ZAeF4cgoto6yP4VELoRZSPZLlJ0YVdDIkEFEn+JTMLHaCaT4qdWMq cpr4pJTX71HaJTN34jGHH8haDKsa8P5jc15WaRS5cCgZaIoaHTAOa9wvGVdu1pSM2b/s4o 5qcy1KVe8uvCNe3xwERorAyYnNEh4MhNs+q41eusPZJRXcOaijg6gDcWcOGXRQ== 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 4hzT321SktzwwV for ; Tue, 06 Oct 2026 07:51:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 18521 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 06 Oct 2026 07:51:10 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Jaeyoon Choi Subject: git: e0ce55de9adc - stable/15 - ufshci: check SDB queue allocations for 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: e0ce55de9adcff53dfb9e614f623d3873d095dc7 Auto-Submitted: auto-generated Date: Tue, 06 Oct 2026 07:51:10 +0000 Message-Id: <6ac4a86e.18521.1f3b6b7f@gitrepo.freebsd.org> The branch stable/15 has been updated by jaeyoon: URL: https://cgit.FreeBSD.org/src/commit/?id=e0ce55de9adcff53dfb9e614f623d3873d095dc7 commit e0ce55de9adcff53dfb9e614f623d3873d095dc7 Author: Jaeyoon Choi AuthorDate: 2026-08-10 01:43:34 +0000 Commit: Jaeyoon Choi CommitDate: 2026-10-06 06:27:57 +0000 ufshci: check SDB queue allocations for failure The hardware queue and ucd_bus_addr allocations use M_NOWAIT but were used without a NULL check, and the payload bus_dmamap_create() return value was ignored, so a failed allocation was only discovered by faulting on it later. Fail the construction instead. The teardown path handles the partially constructed queue. Sponsored by: Samsung Electronics Reviewed by: imp (mentor) Differential Revision: https://reviews.freebsd.org/D58661 (cherry picked from commit 25a61a7927c8b1a516e6e095a6f53031a8636fde) --- sys/dev/ufshci/ufshci_req_sdb.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/sys/dev/ufshci/ufshci_req_sdb.c b/sys/dev/ufshci/ufshci_req_sdb.c index c7bf033ddc37..9f3a2a866ae0 100644 --- a/sys/dev/ufshci/ufshci_req_sdb.c +++ b/sys/dev/ufshci/ufshci_req_sdb.c @@ -86,6 +86,8 @@ ufshci_req_sdb_cmd_desc_construct(struct ufshci_req_queue *req_queue, req_queue->hwq->ucd_bus_addr = malloc(sizeof(bus_addr_t) * req_queue->num_trackers, M_UFSHCI, M_ZERO | M_NOWAIT); + if (req_queue->hwq->ucd_bus_addr == NULL) + return (ENOMEM); /* * Each component must be page aligned, and individual PRP lists @@ -141,8 +143,13 @@ ufshci_req_sdb_cmd_desc_construct(struct ufshci_req_queue *req_queue, } for (i = 0; i < req_queue->num_trackers; i++) { - bus_dmamap_create(req_queue->dma_tag_payload, 0, + error = bus_dmamap_create(req_queue->dma_tag_payload, 0, &hwq->act_tr[i]->payload_dma_map); + if (error != 0) { + ufshci_printf(ctrlr, + "request payload map create failed %d\n", error); + goto out; + } hwq->act_tr[i]->ucd = (struct ufshci_utp_cmd_desc *)ucdmem; hwq->act_tr[i]->ucd_bus_addr = hwq->ucd_bus_addr[i]; @@ -181,6 +188,8 @@ ufshci_req_sdb_construct(struct ufshci_controller *ctrlr, /* Single Doorbell mode uses only one queue. (UFSHCI_SDB_Q = 0) */ req_queue->hwq = malloc(sizeof(struct ufshci_hw_queue), M_UFSHCI, M_ZERO | M_NOWAIT); + if (req_queue->hwq == NULL) + return (ENOMEM); hwq = &req_queue->hwq[UFSHCI_SDB_Q]; hwq->num_entries = req_queue->num_entries; hwq->num_trackers = req_queue->num_trackers;