From nobody Fri Aug 7 01:48:17 2026 X-Original-To: dev-commits-src-branches@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 4hGRr20mcPz6nf7C for ; Fri, 07 Aug 2026 01:48:18 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4hGRr15RFWz3pYX for ; Fri, 07 Aug 2026 01:48:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1786067297; 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=ziyKJI21PRIBV9uNNGhldTvP1qWjFmmpGwo3S6l7nJY=; b=HJHWsFYDycKB85yjpMGWd5bWO9Qjydts0c+5rwGoBKPhB1uTPMrFmObDWQY4C2f2hfSP8y m3Lsvj0OMEFNc6YMcmNPzERxjQZitoh2FySqtTL9yIpiFVFF65TdoeG2lPsvorMrxH9adC TiXrO98O1Xd8i1avSnthQ/xJJNxzll2qMhz80Yx0Btt88TVkiFxyPNHHI0a1uvwiPeUH+t SCVd5gkUpRtXngwXyWG17q20+f8ApBNLwoUunozKf05zHevCplCIC697F47MRWs7vgNuij DQMtCre7A8DZPFAeDHI8n13gnKr+NX7GNQMSYjmju7GEr0buW+kAmMCjzYhzzA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1786067297; a=rsa-sha256; cv=none; b=w42QIcpLgAPNp1JvHt1z4loZUeuBBVGPlc2sG3AEKZa8VeB4eMBOX7wSrpoiWqh9l365LD ZJ+fGhMCUF2CpaVqDSoqxwBqxeFhzkJVmm8E4ogtIFjULZoAzhe8FpEhjXsjQ0vwjAGFVV rdymLY1U+6loPP94qIFUQG2fiOfbaWeC1MoG4BzEtizPpQEd0xKH7qh0L2svY/LByzcobW G48uVcySS9vSvTT+IEvXlGT7US3U/AkioWJsp/ocVAbe9wErGfIW9Onz2+ADDWRrvpNNgy /pMG35PY+JHgC/MBY9L+5kedb9OVfQIWAlwHWuiBTwNJpmh9mG/RYk7MuOyUaQ== 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=1786067297; 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=ziyKJI21PRIBV9uNNGhldTvP1qWjFmmpGwo3S6l7nJY=; b=xe5MwtUpMFXT0EZv04/vLB784iK5OVsSVkKy4rsrOFasRTFZqGJtTsaEnC3dwbNB052xVV X+sDx/5+wfQTljkx2oAip2XlqSpog97WkRTG1NWdGvBps0NdLPrvlPl9h0PLWL0VoD6JJW Fs3I4RmfeqDanBLqT7RnfQqWLlyMwgPbx4MZbY1mJqqzpJAG46IRZzNzPs9DYChy1EWg2P Lws7wbA/xP0HROAETg0mL8oDB1GHGiLQnEWVWsyJdLMci1N8UB/oMRPBQRjfF8br3AySqI 0EhPXgO8Xvt7/1B6pnZpkPdZ0P132gZg1FborSav8GX+ghwYglJU3Wsh1xpUVg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hGRr14Tqczmns for ; Fri, 07 Aug 2026 01:48:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3c233 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 07 Aug 2026 01:48:17 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kyle Evans Subject: git: 10904e0c2b4c - stable/15 - hid: u2f: stop interrupts on last-close List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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: kevans X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 10904e0c2b4cc3b5f4c3e46fb22a2e8cf781c977 Auto-Submitted: auto-generated Date: Fri, 07 Aug 2026 01:48:17 +0000 Message-Id: <6a753961.3c233.2b983a91@gitrepo.freebsd.org> The branch stable/15 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=10904e0c2b4cc3b5f4c3e46fb22a2e8cf781c977 commit 10904e0c2b4cc3b5f4c3e46fb22a2e8cf781c977 Author: Kyle Evans AuthorDate: 2026-07-21 16:57:47 +0000 Commit: Kyle Evans CommitDate: 2026-08-06 23:36:39 +0000 hid: u2f: stop interrupts on last-close This fixes an issue with the Solo2 (and likely some of the Nitrokey family) where hangs would occur with OpenSSH- it issues a CANCEL prior to closing the device unconditionally, and without draining the read endpoint we end up seeing the response to that CANCEL the next time OpenSSH tries to connect. This throws the entire command/response sequence out of whack. This call used to break Yubikeys in some situations, but the fix that landed in 28d85db46b48 ("xhci: Do not drop and add bits in xhci") seems to have addressed that- presumably we sometimes end up stopping the command and desyncing at the controller level. This probably implies that we need a SYNCWRITE HID quirk, but that requires a little more work in usbhid_sync_xfer() and this doesn't seem to cause any problems in normal usage. Reviewed by: aokblast, wulf (cherry picked from commit 2e3892671a6fe2bceff6a9d8b439e7acd27dc28a) --- sys/dev/hid/u2f.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/sys/dev/hid/u2f.c b/sys/dev/hid/u2f.c index e1f696d72f01..d4bb56368080 100644 --- a/sys/dev/hid/u2f.c +++ b/sys/dev/hid/u2f.c @@ -223,7 +223,6 @@ u2f_detach(device_t dev) } taskqueue_drain(taskqueue_thread, &sc->sc_kqtask); - hid_intr_stop(sc->sc_dev); knlist_clear(&sc->sc_rsel.si_note, 0); knlist_destroy(&sc->sc_rsel.si_note); @@ -300,10 +299,8 @@ u2f_dtor(void *data) { struct u2f_softc *sc = data; -#ifdef NOT_YET /* Disable interrupts. */ hid_intr_stop(sc->sc_dev); -#endif mtx_lock(&sc->sc_mtx); sc->sc_state.open = false;