From nobody Tue Oct 06 07:51:07 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 4hzT303YQrz6cWKs for ; Tue, 06 Oct 2026 07:51:08 +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 4hzT3018p3z4GY4 for ; Tue, 06 Oct 2026 07:51:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1791273068; 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=d706M8YebRvjK8UOcUlPpdHedTGsfKIwOclM5FyBafw=; b=V/XTR9hXY4LFh6MBevap00QTuaawlAvMU1G4c9Em0aM6ukwQyBlnKOoT/Nf9VxYs0Vq0Zj lJc5XG+d8toKJyqpWS7ITIcKpPhzeyC1utSATAkfpoti7e3LU0M9R0PKcMTz3wy/Yo3IvI w4wRa1WLdIiMmMhIi1X1OnoGeKeorBYtde6aCz/SFYWSQdHm2IRvsh+7eW0b4TqCW6f/Z0 Fw9RdBxFsqPWcbXRzKAzZUISzCzna49+I17MphnJ2mMSVzVuNKzCtKs01LCQj2aNJo05kV OaoXZdBanTnuB84DDir8GlSb/6m24MIr9covoT4evI40aFFFrGwg8PWYkbjtAw== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1791273068; b=J+0Zcem/+h1m1h+spcaFm9O8oHfepNHP06kVcESLQsXJ6gaLPH+kcb6No8ZuIpwmzf4GSK RtM7M0jlYZAsZsMQQi2rGenswSNMzXtjZqEk+5n7g8GOpgrfoS8HpaH/boGLIfaCGTuFot LVwD+5U/mkGwhSf6Bk4I2GAyCkJ+br22DRmKAQqhv+DHMDdLbxBLXKKBq6O5xu1/uuiZFi n2tdtEQ+9FY6CXB4O3RDOb0fJYK63nAlbKCTMsucakOS/AKXN85LW3jE1p7ijc899/cFmB BMSxESHd3XqbU4h2L3GJ7i0Kk1ShKnRxNzxQc9/4B+biIpZnwzgF5hvaQXNOkQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1791273068; 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=d706M8YebRvjK8UOcUlPpdHedTGsfKIwOclM5FyBafw=; b=v+esHEpn9DQeXwPo7N0ghmhq9CtBsuoxizPULe8mJ+7q2lVcTKk+pj8FLNfep6sebFaOoO dXOOrx6YtnnfesgQjO1T2vfmo/uJ2juhacFGRgTQp9HospawWU55xxOvT5T++joMCkM9hG ehyvSt3j71szxZSHCuTWihzVMRgxXX27WIwmj6xl0EfeccKx5crk5wn8ihGNWErsznWKaX qcUvLD9mJhZquLop0+/V50OFRpHmZZw+da/ijs7bWae4mBadHXV8G5xhtKMxo6GUDqNU9o 9wLU74HJfflGrXL/fZeg043G6G0af40ErGQc//PT7c3eDasgx/XGJJTIrZaLQw== 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 4hzT2z6z37zxZF for ; Tue, 06 Oct 2026 07:51:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1904c by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 06 Oct 2026 07:51:07 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Jaeyoon Choi Subject: git: 87ececd2dd8f - stable/15 - ufshci: free the correct address when DMA load fails 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: 87ececd2dd8f3de45be0010e0bfbd9941d4e29e5 Auto-Submitted: auto-generated Date: Tue, 06 Oct 2026 07:51:07 +0000 Message-Id: <6ac4a86b.1904c.56e9d025@gitrepo.freebsd.org> The branch stable/15 has been updated by jaeyoon: URL: https://cgit.FreeBSD.org/src/commit/?id=87ececd2dd8f3de45be0010e0bfbd9941d4e29e5 commit 87ececd2dd8f3de45be0010e0bfbd9941d4e29e5 Author: Jaeyoon Choi AuthorDate: 2026-08-10 01:40:28 +0000 Commit: Jaeyoon Choi CommitDate: 2026-10-06 06:27:56 +0000 ufshci: free the correct address when DMA load fails The bus_dmamap_load() error paths passed hwq->utrd and req_queue->ucd to bus_dmamem_free(), but both pointers are only assigned after a successful load and are still NULL at that point. The freshly allocated memory was leaked. Free the local buffer instead. Sponsored by: Samsung Electronics Reviewed by: imp (mentor) Differential Revision: https://reviews.freebsd.org/D58659 (cherry picked from commit c2186638ff7052e3803f2bdab9ad62cfb69ac7de) --- sys/dev/ufshci/ufshci_req_sdb.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/dev/ufshci/ufshci_req_sdb.c b/sys/dev/ufshci/ufshci_req_sdb.c index 54542f48b32c..cc99b645331c 100644 --- a/sys/dev/ufshci/ufshci_req_sdb.c +++ b/sys/dev/ufshci/ufshci_req_sdb.c @@ -112,7 +112,7 @@ ufshci_req_sdb_cmd_desc_construct(struct ufshci_req_queue *req_queue, if (bus_dmamap_load(req_queue->dma_tag_ucd, req_queue->ucdmem_map, ucdmem, ucd_allocsz, ufshci_ucd_map, hwq, 0) != 0) { ufshci_printf(ctrlr, "failed to load cmd desc memory\n"); - bus_dmamem_free(req_queue->dma_tag_ucd, req_queue->ucd, + bus_dmamem_free(req_queue->dma_tag_ucd, ucdmem, req_queue->ucdmem_map); goto out; } @@ -222,7 +222,7 @@ ufshci_req_sdb_construct(struct ufshci_controller *ctrlr, if (bus_dmamap_load(hwq->dma_tag_queue, hwq->queuemem_map, queuemem, alloc_size, ufshci_single_map, &queuemem_phys, 0) != 0) { ufshci_printf(ctrlr, "failed to load request queue memory\n"); - bus_dmamem_free(hwq->dma_tag_queue, hwq->utrd, + bus_dmamem_free(hwq->dma_tag_queue, queuemem, hwq->queuemem_map); goto out; }