From nobody Wed May 7 21:37:14 2025 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 4Zt7rq31c2z5vKv6; Wed, 07 May 2025 21:37:15 +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 4Zt7rp6Jj7z3m7s; Wed, 07 May 2025 21:37:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746653835; 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=EnsCgKCHJs4oKxImPVqSBPcnU4wNnl6b2ij4lBH0qKM=; b=Fenx+oT+V9fthkhXPUAvWF8B2wLnQ2JOOoHLG6e1tHl9CyqAE4FQ3sdKUkDRu0l4leT3yT QxOa7ueINcnfKArE8pCZsJeKYHNmykEzcu0dQUAaF3rnLpRMwwh7resLNQIDrIHZ9H5X+M E4qjLvPh1WX9Rw0niUMlt2/KHjTh6NOQsmy5b8PFp9f2oz1ABB3zjyRdQFbRm2Rc2zvxmn 7drY5YkHcwAQF56FIZrA7Oy+WTdX/0O0wSfyf8K05AvThxalZdLhIUJlwTIMXPP6XS9B8V hCWQbPUJDY/ug9zckIxtFuPDm1RGSPFS9o2ULArpJ+Im9RpTc0YDOpTn/mBYMA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746653835; 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=EnsCgKCHJs4oKxImPVqSBPcnU4wNnl6b2ij4lBH0qKM=; b=wBlw9agpPNG9maD1J5UyrdVKurgGjJEM2SbfO0K+PzO7e+xQ3mCm38f4l2XIay6eWyqVEu Tyo6xVBqFowwaQ7S3nAYJq9b+GzuQWHHWa3O0oeSCjShdfDTEHF3Kuh17+7rhjLGiSy/CB DDCFD1aEPnvyu8g7M2XrFXZZc8dSCmHi7jUiHgw8LGnrSnYHKIW6vP5OWGJw2B4IgstV9r 1kBZQLr3Y9dg2ADXQ36C/iwLenPCJ32+c9d6jOCsajtrzyz0IVrYxs9BtzUXXobZNkRgif GEJqpMiwCcTRoL3m9rY5orwcdnVfmX8M8zyPc5jeVQAFuGF314wW/4rkH0Vx0g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1746653835; a=rsa-sha256; cv=none; b=iESSI9ftsTQKyXnk9Z1RoD2aTrEMrF01HAyywSHx5X3jZHJRRo77f7V9nurEO/x8bsGo93 6iVlIjGGxdg5XHAlLOR922pLFLZSySsSdkugI+ABMuzGfw6SRUIdVhqCvIJIO6GyVdNLv6 Q44Jag0dANnfwggaeLiPDXbe5IUME9zn1lker936fQec+aE/L+VyCKomrhTSjlHC/3stFY WoxB98SFhcfE5zFQS7WsFXOtD2YEcsS+i6ftXpb90TejPZLtNcy29zchAERD5c0Zk6qaW0 PXsnijMQU+yJj3fbsFW50MX2FSdloFb53E39dd4mDqhO2YNYqSj7CbIndEwD7A== 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 4Zt7rp5b9hzn6X; Wed, 07 May 2025 21:37:14 +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 547LbE62092225; Wed, 7 May 2025 21:37:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 547LbEAB092222; Wed, 7 May 2025 21:37:14 GMT (envelope-from git) Date: Wed, 7 May 2025 21:37:14 GMT Message-Id: <202505072137.547LbEAB092222@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: ff77f1ca5ae8 - main - umass: Fix a direct call to sc_transform 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 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: ff77f1ca5ae8dd7fcaee54672067e1493d953d7e Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=ff77f1ca5ae8dd7fcaee54672067e1493d953d7e commit ff77f1ca5ae8dd7fcaee54672067e1493d953d7e Author: Warner Losh AuthorDate: 2025-05-07 16:07:45 +0000 Commit: Warner Losh CommitDate: 2025-05-07 21:36:55 +0000 umass: Fix a direct call to sc_transform Call umass_std_transform instead of following the sc_transform member to get the standard transforms now that has moved to umass_std_transform. Pass NULL as the CCB so that we don't stomp on the status that was just set (and allow that in std_transform). Sponsored by: Netflix Differential Revision: https://reviews.freebsd.org/D49474 --- sys/dev/usb/storage/umass.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/sys/dev/usb/storage/umass.c b/sys/dev/usb/storage/umass.c index 04a0157b14ce..c3a5028f5726 100644 --- a/sys/dev/usb/storage/umass.c +++ b/sys/dev/usb/storage/umass.c @@ -2625,11 +2625,14 @@ umass_cam_sense_cb(struct umass_softc *sc, union ccb *ccb, uint32_t residue, DPRINTF(sc, UDMASS_SCSI, "Doing a sneaky" "TEST_UNIT_READY\n"); - /* the rest of the command was filled in at attach */ - - if ((sc->sc_transform)(sc, + /* + * Transform the TUR and if successful, send it. Pass + * NULL for the ccb so we don't override the above + * status. + */ + if (umass_std_transform(sc, NULL, &sc->cam_scsi_test_unit_ready.opcode, - sizeof(sc->cam_scsi_test_unit_ready)) == 1) { + sizeof(sc->cam_scsi_test_unit_ready))) { umass_command_start(sc, DIR_NONE, NULL, 0, ccb->ccb_h.timeout, &umass_cam_quirk_cb, ccb); @@ -2890,7 +2893,8 @@ umass_std_transform(struct umass_softc *sc, union ccb *ccb, } if (sc->sc_transform(sc, cmd, cmd_len)) return (true); /* Execute command */ - umass_cam_illegal_request(ccb); + if (ccb) + umass_cam_illegal_request(ccb); return (false); /* Already failed -- don't submit */ }