From nobody Wed May 07 21:37:11 2025 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 4Zt7rm3dLHz5vKr6; Wed, 07 May 2025 21:37:12 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Zt7rl3Zm0z3m4J; Wed, 07 May 2025 21:37:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746653831; 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=6mzxlAk2oyUF8Biy3uABXIbHQgWTOcAnbvIu3CKa/oo=; b=WPLUwjgHiYQnOsSbN2m4JMonWyUNr74XAgJSu4hwWAjT64md5ajAWQbPlxcSpG8bJpXYQD TSeR6lZ2m390ynjpCah4sSqMzPG8ybgLZOpPdDvzYQmWcBmb/PrmgaEpEAL/K401PthOar Foe5AX3hWnO0goEniOtIj6RFGvtB2B58D9eP0DjB4R5c/VQPajglaJeLyv0pLQXVHybWJH jU3Yog+RoWsrnl4pDQv/4oQh357TvqkIrpo8tkwuSnLxVGvl63uOXDZUX9VVcz0Kd3Pj/Y UBziyYfEsf7RTw3h7P+7cm+RoO9/oQ1meD061K1P/MvHbOwSVvqF6F76K4N/Ug== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746653831; 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=6mzxlAk2oyUF8Biy3uABXIbHQgWTOcAnbvIu3CKa/oo=; b=s9hRdPf9RGYtMLPa8P8HP5JMNOtazm45GwKDnpQ2qsua6qQ0Hslhk/+qD9YROSFeyIrRB1 XQBFqnh6r2xnylvi9mL9VgQ8D3Wyr8lLZNH1N31kwdfstFsAvKloaHJSq6EkqfqY5vKmis 7u/2KK8/QPivAsyM8FuvB5g6tnwQtTivucLjWmFT6ImLgfLTx6KecFQtT9j+1U8dA6qGgX o+kZF203iOE9gycLzoVJdF0V6OSm0PyhMw/1XDFIY6BZBhEFc2w/X7CUqS0ki5lAoSarIw SHtMBFbze1JuXqyqv2qf0+72em1m8eiQyepoW7zwtr1aCxsULkz2MofuFAuwCg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1746653831; a=rsa-sha256; cv=none; b=JmrT5qDh87tdQt0rVq9DNDLaFfrT7cDrHE4TCLQksRTs0T+gZg6oBtHBS/sH0ILrVoeHT3 gYPCYvK+hG3+5SmxbyCXh0tPHh4+7+8zu0emZOxBILzPmlw9wySaEfR0mvw3In5VcEgGPn ECmMB+OeYzNAWu+c1yVDhWx+QTJcx2C0r6Gt6ULOgHkrnV9Rru/8jJ4nKrfQy8qcEoDFkJ SjXi2FQRGztYy3iyN+9HhkLPxMBSBtq9egiAI23VVvxoOg4vKx19pPINO5lroYyRfcHQym URWIdai2GPRc6jhMlj6k+dxGzCw4zdHsupZgSCGEncDRULRvbfNdSnAPFm7+aw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Zt7rl34tzzn6V; Wed, 07 May 2025 21:37:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 547LbBup092121; Wed, 7 May 2025 21:37:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 547LbBLS092118; Wed, 7 May 2025 21:37:11 GMT (envelope-from git) Date: Wed, 7 May 2025 21:37:11 GMT Message-Id: <202505072137.547LbBLS092118@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: b8e77c8b00c1 - main - umass: Move common code into umass_std_transform 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 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b8e77c8b00c1190005142b1a2a70e3b5d36c6841 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=b8e77c8b00c1190005142b1a2a70e3b5d36c6841 commit b8e77c8b00c1190005142b1a2a70e3b5d36c6841 Author: Warner Losh AuthorDate: 2025-05-07 16:07:31 +0000 Commit: Warner Losh CommitDate: 2025-05-07 21:36:54 +0000 umass: Move common code into umass_std_transform Move the length checks, and byte copying into umass_std_transform. The copies are typically small and this simplifies the code a lot. Move zeroing the buffer now to only when we change TEST UNIT READY to START STOP. Sponsored by: Netflix Differential Revision: https://reviews.freebsd.org/D49471 --- sys/dev/usb/storage/umass.c | 54 +++++++++------------------------------------ 1 file changed, 11 insertions(+), 43 deletions(-) diff --git a/sys/dev/usb/storage/umass.c b/sys/dev/usb/storage/umass.c index f7df9f49257e..344a42f718fc 100644 --- a/sys/dev/usb/storage/umass.c +++ b/sys/dev/usb/storage/umass.c @@ -2680,12 +2680,6 @@ static bool umass_scsi_transform(struct umass_softc *sc, uint8_t *cmd_ptr, uint8_t cmd_len) { - if ((cmd_len == 0) || - (cmd_len > sizeof(sc->sc_transfer.cmd_data))) { - DPRINTF(sc, UDMASS_SCSI, "Invalid command " - "length: %d bytes\n", cmd_len); - return (false); /* failure */ - } sc->sc_transfer.cmd_len = cmd_len; switch (cmd_ptr[0]) { @@ -2706,26 +2700,16 @@ umass_scsi_transform(struct umass_softc *sc, uint8_t *cmd_ptr, * information. */ if (sc->sc_quirks & FORCE_SHORT_INQUIRY) { - memcpy(sc->sc_transfer.cmd_data, cmd_ptr, cmd_len); sc->sc_transfer.cmd_data[4] = SHORT_INQUIRY_LENGTH; - return (true); } break; } - - memcpy(sc->sc_transfer.cmd_data, cmd_ptr, cmd_len); return (true); } static bool umass_rbc_transform(struct umass_softc *sc, uint8_t *cmd_ptr, uint8_t cmd_len) { - if ((cmd_len == 0) || - (cmd_len > sizeof(sc->sc_transfer.cmd_data))) { - DPRINTF(sc, UDMASS_SCSI, "Invalid command " - "length: %d bytes\n", cmd_len); - return (false); /* failure */ - } switch (cmd_ptr[0]) { /* these commands are defined in RBC: */ case READ_10: @@ -2746,9 +2730,6 @@ umass_rbc_transform(struct umass_softc *sc, uint8_t *cmd_ptr, uint8_t cmd_len) */ case REQUEST_SENSE: case PREVENT_ALLOW: - - memcpy(sc->sc_transfer.cmd_data, cmd_ptr, cmd_len); - if ((sc->sc_quirks & RBC_PAD_TO_12) && (cmd_len < 12)) { memset(sc->sc_transfer.cmd_data + cmd_len, 0, 12 - cmd_len); @@ -2769,18 +2750,9 @@ static bool umass_ufi_transform(struct umass_softc *sc, uint8_t *cmd_ptr, uint8_t cmd_len) { - if ((cmd_len == 0) || - (cmd_len > sizeof(sc->sc_transfer.cmd_data))) { - DPRINTF(sc, UDMASS_SCSI, "Invalid command " - "length: %d bytes\n", cmd_len); - return (false); /* failure */ - } /* An UFI command is always 12 bytes in length */ sc->sc_transfer.cmd_len = UFI_COMMAND_LENGTH; - /* Zero the command data */ - memset(sc->sc_transfer.cmd_data, 0, UFI_COMMAND_LENGTH); - switch (cmd_ptr[0]) { /* * Commands of which the format has been verified. They @@ -2796,6 +2768,8 @@ umass_ufi_transform(struct umass_softc *sc, uint8_t *cmd_ptr, DPRINTF(sc, UDMASS_UFI, "Converted TEST_UNIT_READY " "to START_UNIT\n"); + /* Zero the command data */ + memset(sc->sc_transfer.cmd_data, 0, UFI_COMMAND_LENGTH); sc->sc_transfer.cmd_data[0] = START_STOP_UNIT; sc->sc_transfer.cmd_data[4] = SSS_START; return (1); @@ -2835,7 +2809,6 @@ umass_ufi_transform(struct umass_softc *sc, uint8_t *cmd_ptr, return (false); /* failure */ } - memcpy(sc->sc_transfer.cmd_data, cmd_ptr, cmd_len); return (true); /* success */ } @@ -2846,18 +2819,9 @@ static bool umass_atapi_transform(struct umass_softc *sc, uint8_t *cmd_ptr, uint8_t cmd_len) { - if ((cmd_len == 0) || - (cmd_len > sizeof(sc->sc_transfer.cmd_data))) { - DPRINTF(sc, UDMASS_SCSI, "Invalid command " - "length: %d bytes\n", cmd_len); - return (false); /* failure */ - } /* An ATAPI command is always 12 bytes in length. */ sc->sc_transfer.cmd_len = ATAPI_COMMAND_LENGTH; - /* Zero the command data */ - memset(sc->sc_transfer.cmd_data, 0, ATAPI_COMMAND_LENGTH); - switch (cmd_ptr[0]) { /* * Commands of which the format has been verified. They @@ -2867,13 +2831,10 @@ umass_atapi_transform(struct umass_softc *sc, uint8_t *cmd_ptr, case INQUIRY: /* * some drives wedge when asked for full inquiry - * information. + * information, so adjust the transfer length */ if (sc->sc_quirks & FORCE_SHORT_INQUIRY) { - memcpy(sc->sc_transfer.cmd_data, cmd_ptr, cmd_len); - sc->sc_transfer.cmd_data[4] = SHORT_INQUIRY_LENGTH; - return (true); } break; @@ -2881,6 +2842,7 @@ umass_atapi_transform(struct umass_softc *sc, uint8_t *cmd_ptr, if (sc->sc_quirks & NO_TEST_UNIT_READY) { DPRINTF(sc, UDMASS_SCSI, "Converted TEST_UNIT_READY " "to START_UNIT\n"); + memset(sc->sc_transfer.cmd_data, 0, ATAPI_COMMAND_LENGTH); sc->sc_transfer.cmd_data[0] = START_STOP_UNIT; sc->sc_transfer.cmd_data[4] = SSS_START; return (true); @@ -2931,7 +2893,6 @@ umass_atapi_transform(struct umass_softc *sc, uint8_t *cmd_ptr, break; } - memcpy(sc->sc_transfer.cmd_data, cmd_ptr, cmd_len); return (true); /* success */ } @@ -2948,6 +2909,13 @@ umass_std_transform(struct umass_softc *sc, union ccb *ccb, { uint8_t retval; + if (cmd_len == 0 || cmd_len > sizeof(sc->sc_transfer.cmd_data)) { + DPRINTF(sc, UDMASS_SCSI, "Invalid command length: %d bytes\n", + cmd_len); + return (false); /* failure */ + } + + memcpy(sc->sc_transfer.cmd_data, cmd_ptr, cmd_len); if (sc->sc_transform(sc, cmd, cmdlen)) return (true); /* Execute command */