From nobody Tue Aug 18 05:26:12 2026 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 4hPJ8P2w08z6q0BQ for ; Tue, 18 Aug 2026 05:26:13 +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 4hPJ8N73Qlz3RX6 for ; Tue, 18 Aug 2026 05:26:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1787030773; 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=QYsAGO6Zk/Mc7ALzfEkR+1pQRRvfJoFDYdsFj6otGjs=; b=SAFpB95XOKTtBbE4lECGPTLpdNMum394qEH2uh0QJmYyYWS8ffPJQ9itdBfWheNzvq+Mcd gKrCierGEn6ImcoBrX/jL4z98ZyHnJ4y7l8i2dP9QTOMfChhDaf53T00Gwn0rFSIKGP9+d 6NPmoOcmtQXaBJ0ES0BbU04TBg6R4dZl4svSAUUM4FoSSXt6M4hfg7e7ef9jyrG3/ZehLL OPwSEDmHk2Mk9UzblBfIMUe3KScH57p/Nfc82JDjS/mhixsHz31KtPWz7Hk7MCd8+PyVfr hKI140pilPlmiZ44b4v3b8gpTImu7E0A8HTKz71LZYfuD52lnhOBuGGUKwOung== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1787030773; a=rsa-sha256; cv=none; b=ntpwMiSEyyNc5K0I/YLNxf3v2Ue/b9oR5WUrASvCMkAvdTAQwphv1kVU8B+bbv+pwr6dQh EBbvb1ZwVZ96U9bIfWe1FVjhhVdoqLXHGkaB8ZYMkB6hB1L1/xvZh0wXDoRTba+FzwWpgZ usKjY7b4ykVuD/65EJvvdbEEcjjvUD5UrFa1OWmE3YgMNEVjZT8LDfhbedIx+FtL221nxs 0sRoV86tMPOm4A2IEhXiFLMEfDOgapt7VdvlGh5M5PNVTG7Iiyi2O5beBZjzfc9r7Wpngo qHZOybRkgMN9kaHm98WhKl47R30ta3cClL2k8cPth6EtgqH7TUydI1O48Hk97w== 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=1787030773; 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=QYsAGO6Zk/Mc7ALzfEkR+1pQRRvfJoFDYdsFj6otGjs=; b=deWYvXIOZrqIzNn9y3PfogaUT/+v/s8xJonQcPTAGVhcAD9TIwrFx50dSkEb4yCqtegDeM ImUESAJrTi/rWGhwln5P7qZx3OGD/JAarjUrwABspN5sgTB7qK9s2RoF1YirizI+b4mcPA m3Cdeh+CbCVemJIprMoCpoo9da/u3GuV3WILZ2UfVXapd6pc0pamT3ILkQYBXhxtBQiEXd 6wt+u9VL6isw9foZ4RXSVec1TDPd3JmvnbSFpo4X+xZTMvFiOurHXRuHakadhvdf+G6YN5 hoWLL+IGD92KEZpzf9hHzaLnX+sW6+zM6D7l3AtBSVYes+xAmWoXf/axVnb9vg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hPJ8N5hWMzVFR for ; Tue, 18 Aug 2026 05:26:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3ad8a by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 18 Aug 2026 05:26:12 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jaeyoon Choi Subject: git: f3c3db35d545 - main - ufshci: validate the CDB before allocating a request 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 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/main X-Git-Reftype: branch X-Git-Commit: f3c3db35d545bb14b96e4cb079312c377247540b Auto-Submitted: auto-generated Date: Tue, 18 Aug 2026 05:26:12 +0000 Message-Id: <6a83ecf4.3ad8a.3376de7@gitrepo.freebsd.org> The branch main has been updated by jaeyoon: URL: https://cgit.FreeBSD.org/src/commit/?id=f3c3db35d545bb14b96e4cb079312c377247540b commit f3c3db35d545bb14b96e4cb079312c377247540b Author: Jaeyoon Choi AuthorDate: 2026-08-18 04:51:42 +0000 Commit: Jaeyoon Choi CommitDate: 2026-08-18 04:51:42 +0000 ufshci: validate the CDB before allocating a request The CDB pointer and length checks depend only on the CCB, so perform them before allocating and initializing the request. This avoids a wasted allocation for invalid CCBs on the I/O path and removes one request-free error path. Reviewed by: imp (mentor) Sponsored by: Samsung Electronics Differential Revision: https://reviews.freebsd.org/D58817 --- sys/dev/ufshci/ufshci_sim.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/sys/dev/ufshci/ufshci_sim.c b/sys/dev/ufshci/ufshci_sim.c index f969d9c8311b..8ac47fc4a2dc 100644 --- a/sys/dev/ufshci/ufshci_sim.c +++ b/sys/dev/ufshci/ufshci_sim.c @@ -144,6 +144,17 @@ ufshchi_sim_scsiio(struct cam_sim *sim, union ccb *ccb) payload_len = csio->dxfer_len; is_write = csio->ccb_h.flags & CAM_DIR_OUT; + if (csio->ccb_h.flags & CAM_CDB_POINTER) + cdb = csio->cdb_io.cdb_ptr; + else + cdb = csio->cdb_io.cdb_bytes; + + if (cdb == NULL || csio->cdb_len > sizeof(upiu->cdb)) { + ccb->ccb_h.status = CAM_REQ_INVALID; + xpt_done(ccb); + return; + } + /* TODO: Check other data type */ if ((csio->ccb_h.flags & CAM_DATA_MASK) == CAM_DATA_BIO) req = ufshci_allocate_request_bio((struct bio *)payload, @@ -184,17 +195,6 @@ ufshchi_sim_scsiio(struct cam_sim *sim, union ccb *ccb) upiu->expected_data_transfer_length = htobe32(payload_len); - if (csio->ccb_h.flags & CAM_CDB_POINTER) - cdb = csio->cdb_io.cdb_ptr; - else - cdb = csio->cdb_io.cdb_bytes; - - if (cdb == NULL || csio->cdb_len > sizeof(upiu->cdb)) { - ccb->ccb_h.status = CAM_REQ_INVALID; - ufshci_free_request(req); - xpt_done(ccb); - return; - } memcpy(upiu->cdb, cdb, csio->cdb_len); ccb->ccb_h.status |= CAM_SIM_QUEUED;