From nobody Wed Jun 11 23:16:33 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 4bHhPG1h12z5ydjw; Wed, 11 Jun 2025 23:16:34 +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 4bHhPF6RVyz3L0x; Wed, 11 Jun 2025 23:16:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1749683793; 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=NJWw6h3s2s4e0WP2IIndweVdzD6nflx5BDAJE9BGuPA=; b=QwWnHUfCa3FNYsvPG8AmTNxL0lcQlySosq4vnHTt9BoTNucWktL+MTPbPphoi+QkEXP3Gl pO2xv0dDVX/3lGqpBzr1ankHD2H+PiNH+Kysm9XEIdAMgSDCVwGLX3MFaFxeU0Fi55awKA IcYHFwfOuneXYL7w5aQdpIqqGB5wHNpqxf3KxIVRNeoZUpoVxdkifnlOJeyJftJe2NgGgh qqJ/pPHsWikrEdgONGTAMHqXW+4SygVRd8/OKzp7C2i14wLxn+SH3LQ8HrtYZOBbKwv70U eq/PFw159Z74EsyQjSc5amrD44mde+5l5IU+i+Tx4ZCJIsCBfvSCnzGwCAHzSg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1749683793; 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=NJWw6h3s2s4e0WP2IIndweVdzD6nflx5BDAJE9BGuPA=; b=p2VhXf+vbgcKD6bm1qdw4idwg0lpG8zXhNMaSz3KP4sYa/Ul1DFkqR/oWPRSN+SUMY2PJS +0+hmGD3Yf5QGaeB9yyqMiDjGhXlWZORRPrxtwhqycC6pZ0M55kliWK+NidLQkbEW0ZLPs q9sjQ8uqJIrDPl2sF+b05ZBamaAqB6K6Uh3Rt+Gd/tajdYbgrUZo+LaduTHw94dzwB00Sb rqHfCaq5R3XPPeC5mXa1gfw2loBCVmyUpJusmqLB2n+EG+4OC6oyTPMJLZ9UOenihLkRS7 QoLnN7fixeEhS75h1qRGVHK1ZbUjyCiWG7qU+G2GdUCOSNUtSYQD8Ep3RjaBeQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1749683793; a=rsa-sha256; cv=none; b=KpltVzJPOGun8RX8nmsBVzyCyx2x0H1qSHB3Ov25VtqvjtbDIafPIMefVd5WlI+CtpVzMM 4fw3/mdJeCR6JuqcS/enkISWMnQ5ntwfvgE8qWmEgwdBM2Nocw++jiCVDzzG5Gqa7pf+7J Jos9BHdDT3Y2hs9LpSfrpMytBFuVw1Vt3BmKUKsmZHKMyG9uZQfMo8ehSEIrQYhT6T3WVZ OOYic4lCsxYHG2xlv3ruE6oP2jp6r9HHaqXcpUrDBhX78hSnd1VjEjxDNN7+s16UkiuBA1 2CGCNVUhnirPvYCvCsIKa0D/y5jift8tA8VQ2EOeawOZ6XZwAfCe5ctzORC87A== 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 4bHhPF5lqPzn0v; Wed, 11 Jun 2025 23:16:33 +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 55BNGXUN045990; Wed, 11 Jun 2025 23:16:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 55BNGX5N045987; Wed, 11 Jun 2025 23:16:33 GMT (envelope-from git) Date: Wed, 11 Jun 2025 23:16:33 GMT Message-Id: <202506112316.55BNGX5N045987@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: c2794499bebe - main - usb: Don't call usb_msc_auto_quirk for UQ_MSC_IGNORE devices 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: c2794499bebefbd94ec109858e1b2cbbf60f6c76 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=c2794499bebefbd94ec109858e1b2cbbf60f6c76 commit c2794499bebefbd94ec109858e1b2cbbf60f6c76 Author: Jan Biedermann AuthorDate: 2025-06-06 13:38:21 +0000 Commit: Warner Losh CommitDate: 2025-06-11 23:16:21 +0000 usb: Don't call usb_msc_auto_quirk for UQ_MSC_IGNORE devices usb_msc_auto_quirk() potentially crashes usb devices with a hidden storage (see bug 287333). These devices may still operate normally if usb_msc_auto_quirk() would not be called all and the hidden storage is ignored. This patch makes sure, that usb_msc_auto_quirk() is not called when the UQ_MSC_IGNORE quirk is set for a device. It shouldn't be called anyway if the hidden storage supposed to be ignored. This gives users a chance to get their devices working by using 'usbconfig add_dev_quirk_vplh UQ_MSC_IGNORE'. Reviewed by: imp MFC After: 1 week Pull Request: https://github.com/freebsd/freebsd-src/pull/1716 Closes: https://github.com/freebsd/freebsd-src/pull/1716 --- sys/dev/usb/usb_device.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sys/dev/usb/usb_device.c b/sys/dev/usb/usb_device.c index 49195bd0af38..60c2d6745b3f 100644 --- a/sys/dev/usb/usb_device.c +++ b/sys/dev/usb/usb_device.c @@ -2068,7 +2068,8 @@ repeat_set_config: usb_test_quirk(&uaa, UQ_MSC_NO_SYNC_CACHE) == 0 && usb_test_quirk(&uaa, UQ_MSC_NO_TEST_UNIT_READY) == 0 && usb_test_quirk(&uaa, UQ_MSC_NO_GETMAXLUN) == 0 && - usb_test_quirk(&uaa, UQ_MSC_NO_INQUIRY) == 0) { + usb_test_quirk(&uaa, UQ_MSC_NO_INQUIRY) == 0 && + usb_test_quirk(&uaa, UQ_MSC_IGNORE) == 0) { /* * Try to figure out if there are any MSC quirks we * should apply automatically: