From nobody Mon Mar 2 00:51:17 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 4fPL393Jfgz6Ty70 for ; Mon, 02 Mar 2026 00:51:17 +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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fPL391WHpz3JgH for ; Mon, 02 Mar 2026 00:51:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1772412677; 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=+7fvrAtKuWaqbC1JJXqMOGJoNtQWhvFEDGSMSi6eCmo=; b=MI17K7qZkLDjdDtvv0an1+ZefVwSR92C71fdQgiVrBubCLFrWaWP5+/ZSjNMa5XinPqQET ZAAcSOwZ5so2iP4V7jC9PpwtlAV3vH62pMWq2GwkL3RrfMW1FBjsVcKlesjH/pqXAuEjbo g+xin5HuShy+Xh5vIAk1on/cRa4wHWhqFdkI1OPxzZgU/2a0Z+E5vrQbY1RinocIqXtlGl Auw14t4In7aPRawCPUBsskE3y9C2OUwJcB8kmXUKuMGH+M4USLrk+E1OrdgQ0VSA18GE4a giQzL0X2vRdJBThkbo4i+XYXMfArztIEQOPmw4p/nFqkErbopokt/Onim5jMfA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1772412677; a=rsa-sha256; cv=none; b=dqqxuqG8t/+rNdL5pKiYej1OSaf0QU5JXvV13xiANVcIBk9UY1PEVB6uKXRorWMR2cDT3I SnYp5tWFxeAtUo8gKAKEi2YwhN2AIHyBGMMI25TwnqawxK3ozQiEikzOGbL4TjtMF/imvu z14nJ8fZTLIq2X6uItuLBTZA/6FiK2ElVJqCkjS1z5qP5WxssGNAjw7vfZfD+rZ72cI/gQ Mk59iQbpqAo+1/NbIHuRcc9UDIUL7K4hn8CGfkmgq2pfQWHo8Eoq4TcyUyva2WtKFDNnve zNsDaypEBSCTRnao/GXIEV3HfopOgN8KkWDi1i+Zv0GRZ6e2CrSlC0hcHN25sg== 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=1772412677; 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=+7fvrAtKuWaqbC1JJXqMOGJoNtQWhvFEDGSMSi6eCmo=; b=Iufg7cp+7SN9Q5Z7OK29UQVuoDH6uTPIsrjpuomr//4NadFTZVH8MtMDP9BwrNXz8Lr12M mHXFKuZLlN3gzv/443psidkaHlpx3ReTrUs92X2kBQiG8EmaCIsDs/ePfBfZHLdqQwrksn qvrIay3pMb6ovYUWR09JOMAD5EcaPh4AUNhFLhPjYaQy49VHe7L1dx3wrpUNTZsyBHvq0S RZhOUd0hlUlUXdVf1MV0xPp+KtjKgtnVkrlYcSpKyR1EUDOV6NOoTebWrzc7eJAxx6SojY l5xB37fkDuGOM4uIUwdWID2/KNtiw7sBTunnhOgyO3ciTayijha8n5DqxvwLbg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fPL3915Rkz1C5y for ; Mon, 02 Mar 2026 00:51:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 45946 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 02 Mar 2026 00:51:17 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Chuck Tuffli Subject: git: d329a91dc3e9 - stable/15 - bhyve: fix USB mouse requests 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: chuck X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: d329a91dc3e9c21044d6d25b8e07e0094fc0fbc5 Auto-Submitted: auto-generated Date: Mon, 02 Mar 2026 00:51:17 +0000 Message-Id: <69a4df05.45946.2ad9de6b@gitrepo.freebsd.org> The branch stable/15 has been updated by chuck: URL: https://cgit.FreeBSD.org/src/commit/?id=d329a91dc3e9c21044d6d25b8e07e0094fc0fbc5 commit d329a91dc3e9c21044d6d25b8e07e0094fc0fbc5 Author: Chuck Tuffli AuthorDate: 2026-02-19 22:27:49 +0000 Commit: Chuck Tuffli CommitDate: 2026-03-01 15:42:26 +0000 bhyve: fix USB mouse requests USB HCI requests may not include HCI transfer block structures (i.e., xfer->data[] == NULL), but in several places, the USB mouse emulation code assumes one will exist. This can lead to a NULL pointer dereference and a SEGV in the bhyve process as observed via experiments with an Ubuntu guest and PyUSB code. Note that many of the cases processing other request types already checked for data == NULL. While in the neighborhood, fix a typo in the loop iterating over the usb_data_xfer_block array which used the wrong variable to check for valid data (idx vs. i). (cherry picked from commit 10d5404adb11773969a600428d1abeb4308d98aa) --- usr.sbin/bhyve/usb_mouse.c | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/usr.sbin/bhyve/usb_mouse.c b/usr.sbin/bhyve/usb_mouse.c index 82b1159d5f61..6c0b051c67f2 100644 --- a/usr.sbin/bhyve/usb_mouse.c +++ b/usr.sbin/bhyve/usb_mouse.c @@ -343,7 +343,7 @@ umouse_request(void *scarg, struct usb_data_xfer *xfer) idx = xfer->head; for (i = 0; i < xfer->ndata; i++) { xfer->data[idx].bdone = 0; - if (data == NULL && USB_DATA_OK(xfer,i)) { + if (data == NULL && USB_DATA_OK(xfer, idx)) { data = &xfer->data[idx]; udata = data->buf; } @@ -529,7 +529,9 @@ umouse_request(void *scarg, struct usb_data_xfer *xfer) case UREQ(UR_GET_STATUS, UT_READ_DEVICE): DPRINTF(("umouse: (UR_GET_STATUS, UT_READ_DEVICE)")); - if (data != NULL && len > 1) { + if (data == NULL) + break; + if (len > 1) { if (sc->hid.feature == UF_DEVICE_REMOTE_WAKEUP) USETW(udata, UDS_REMOTE_WAKEUP); else @@ -544,7 +546,9 @@ umouse_request(void *scarg, struct usb_data_xfer *xfer) case UREQ(UR_GET_STATUS, UT_READ_INTERFACE): case UREQ(UR_GET_STATUS, UT_READ_ENDPOINT): DPRINTF(("umouse: (UR_GET_STATUS, UT_READ_INTERFACE)")); - if (data != NULL && len > 1) { + if (data == NULL) + break; + if (len > 1) { USETW(udata, 0); data->blen = len - 2; data->bdone += 2; @@ -629,7 +633,9 @@ umouse_request(void *scarg, struct usb_data_xfer *xfer) break; case UREQ(UMOUSE_GET_IDLE, UT_READ_CLASS_INTERFACE): - if (data != NULL && len > 0) { + if (data == NULL) + break; + if (len > 0) { *udata = sc->hid.idle; data->blen = len - 1; data->bdone += 1; @@ -638,7 +644,9 @@ umouse_request(void *scarg, struct usb_data_xfer *xfer) break; case UREQ(UMOUSE_GET_PROTOCOL, UT_READ_CLASS_INTERFACE): - if (data != NULL && len > 0) { + if (data == NULL) + break; + if (len > 0) { *udata = sc->hid.protocol; data->blen = len - 1; data->bdone += 1;