From nobody Tue Oct 06 07:51:23 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 4hzT3H6xrrz6cWNN for ; Tue, 06 Oct 2026 07:51:23 +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 4hzT3H58tYz4H9h for ; Tue, 06 Oct 2026 07:51:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1791273083; 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=CEVz1FXcOZllKgdY5/5azQ6jd6sVZ64dE9zH4AQcGQo=; b=RvIRD8wujKwZnHefWIR+lrvQOGG9+YiXh1xGMTHODG9uCi/MJJD/sPwzYSxfLAsu2WNrdi Dv0DceB+6cowTmeIQUPCZmNAHsr/ynexBEgYN45brPJl22agKgzCLGgAMkL329VP2/Xqhq m0Qjn4+DIOUrpr5UyfCg7uZojUBI0/m34xW4pMlNplIpjs7r5K9sUXueSBPpl+i1TqlyUW Cw2XVjsvhfMCEPaEmSeDhr2SKm4UQecpx1L3BKf+s0bxyQtg8f7QGYDcjGLH3R/c1hj/sK Ob+WHRuJJT8wvwUbfBLYOCa1HRB0fE+Z9vWmSQj3bQbyCRVIWTF7tvtLhblCsA== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1791273083; b=Cl4dcy9rj0yzcCHUxEdH2zDp1E4j1x2tmCC+3t2Nsm6ON0dAMi1CWerZMYcfURoO6e1A8V E5Dfio5R/Zmh+WmyshNTyFqdMYB8rVMdaIyqDX07g4BwDz1cP89KOotx4SL++3aXExOR7i 4DaG1uQhnuxSr5jSLj2TZaUkl8N3VlSMoiQ2/mro160YyeXqwYcJfsAw7YzBrWmkPLlwm/ ppRixR6xU82NSC1LssAs7d7P2HN4vYqiM4vrVVlCgNGeE6DabSGjbsIKxpwn3zJ3ey7qWg nL0BaVEkbyixTqXuCwcThiSs9bzTt+GJ2RlDNZpjLBBUd/H7U3Mkk4CSS2c/Lw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1791273083; 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=CEVz1FXcOZllKgdY5/5azQ6jd6sVZ64dE9zH4AQcGQo=; b=jZL7Mity2ctsR3R0gkQSKhOcF8ojek3lsZctAMePGID8jfYdNqFLdasFmdRj+7YQFz3BnF fDRQTfwqVFXFJz/nBn/quXEBkwIlnLWcbV9Q2LMtNTiNr7pOs9WNE10owAcgAK9J9STZP3 rUELS7M7WDLwzGEQuNxj4wtps6AmkhC/u/w3uDn8gZo03IULCwkXygJ/Z4TJUfBvRVhaho 3RH0/mi8o2AbuUBrfhy3hhtu0btLME1YWnEcdrYmtj2XYkdnLztjBvEa283brhJ9yiL+aL 4EDza5Nbgl6g7HYVUKnnXlFUyxUDa1Um6L7KOSa5Ul5EmPm63lG0Pr0FycJC0A== 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 4hzT3H3B62zxZL for ; Tue, 06 Oct 2026 07:51:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 18830 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 06 Oct 2026 07:51:23 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Jaeyoon Choi Subject: git: 7fb453f00502 - stable/15 - ufshci: validate the CDB before allocating a request 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: 7fb453f00502c522656f44715f2a55a0313e76d0 Auto-Submitted: auto-generated Date: Tue, 06 Oct 2026 07:51:23 +0000 Message-Id: <6ac4a87b.18830.10c718c2@gitrepo.freebsd.org> The branch stable/15 has been updated by jaeyoon: URL: https://cgit.FreeBSD.org/src/commit/?id=7fb453f00502c522656f44715f2a55a0313e76d0 commit 7fb453f00502c522656f44715f2a55a0313e76d0 Author: Jaeyoon Choi AuthorDate: 2026-08-18 04:51:42 +0000 Commit: Jaeyoon Choi CommitDate: 2026-10-06 06:28:02 +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 (cherry picked from commit f3c3db35d545bb14b96e4cb079312c377247540b) --- 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;