From nobody Sun Nov 01 18:35:44 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 4jHk6m5r7Jz6xjlw for ; Sun, 01 Nov 2026 18:35:44 +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) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4jHk6m25WMz3KWd for ; Sun, 01 Nov 2026 18:35:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793558144; 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=iQ2HC+nnc1Iuv6SH5yJCkH6YtKAJe+DD6qT6z0aIPfY=; b=IqzlA4Hf6gwmPO6E1H/tnOnla0jqN2d64ISi6ripMvw7tp6EBaWj0Kky9L+jIck5s3CbQL QAA2z+XvLAzj31wQEgfimjoF4WzqKboy7zor6Cl66ivYjLAt5jJBgPqrKKR82+sDY+4rSm o6fSTNCWQ8VbFL04V6tdrmfqZbRWbAOCJBoniKQhkiY+p3mTFEz+Qok/la/50ftL1N8XQ6 EJIht4leiM8bfpTwhl4ysVZd2SVfZINQyEwVl2gQ+9xI+GxPVRD1QGGspoVYwvPGIOig8C Vtj3KHKDXk/o7Qa474cblIAo7rC+7H4s7kdynbL5BRDPJ+RZW7emeVWP5ow9pg== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1793558144; b=Edfn0n2aGlSDN8gW2HyLBNn6sLitU+JJUffzV3todm7ns8xEALgkYl8XDwOdNY/X83HAfx gNyRxvDAwUQMNaGCIq5nr28dFTdEtbA2b1bORjAWzpST/9g0DdTGEaWkciP6cjhuTg7XyT hcQF8OpbgOX9HxKHr+hjLH6M4oENON29X67sZshjs/UQkWxJsmX3JoSvF8c0Y4TBFTnxki TY0rsm+qUtRmnvDnA3nhRzF7F04qJigppI6/W+rElYL3fyuRIIsUNtCQoJ+5ZLD3mceM0q 0ood0D/pIwWAFSZjn5jOkrtnh1ZvJPw5ej4aGxSJdTMw52G3LD2XoKKH1MV2gg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793558144; 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=iQ2HC+nnc1Iuv6SH5yJCkH6YtKAJe+DD6qT6z0aIPfY=; b=FfQ35k8zVywqNzKAIjvPEzAUGk+fQRTBeRMr+9Pg9H/398F9y6Thlf+u7de/LbbEHR9/CT ItIldZTGYfx+8qK+CeijjQAZgZvmbxy1PX/G1HTDvz3enfI7sZ30A+6je9slkswpqraDGB /CL5lw/+2ABMejmym27OJF/fL9y9L4awesaVKa0D43c3DiS5/vJwGUR5SnTC2ZxekmZ94V 343ELJXjDS2AFAahO4v/+Ul1Zmsljbaz8/8TZKZuxNe9ON/0rO5HwPU/KlLqr/qo+Uyllg 7u2BN6xbaov/Uiq3Avm3ZErSz1fugbS74Y2HejWtng9yauBlK2fxfYcq14uUFA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4jHk6m1jhxz19QM for ; Sun, 01 Nov 2026 18:35:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 230f5 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 01 Nov 2026 18:35:44 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Abdelkader Boudih Subject: git: add962bb175e - stable/15 - ietp: guard iicbus_get_addr with devclass check List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: Commit messages for all branches of the src repository 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: seuros X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: add962bb175e538f6f1d3c8727aa00dfa9c90874 Auto-Submitted: auto-generated Date: Sun, 01 Nov 2026 18:35:44 +0000 Message-Id: <6ae78680.230f5.4d5fbb5@gitrepo.freebsd.org> The branch stable/15 has been updated by seuros: URL: https://cgit.FreeBSD.org/src/commit/?id=add962bb175e538f6f1d3c8727aa00dfa9c90874 commit add962bb175e538f6f1d3c8727aa00dfa9c90874 Author: Abdelkader Boudih AuthorDate: 2026-07-25 01:28:44 +0000 Commit: Abdelkader Boudih CommitDate: 2026-11-01 17:01:42 +0000 ietp: guard iicbus_get_addr with devclass check When a USB HID device triggers identify, the grandparent is usbhid on a USB hub. Calling iicbus_get_addr() on a non-iicbus device hits a KASSERT panic. Reviewed by: adrian Differential Revision: https://reviews.freebsd.org/D58432 (cherry picked from commit 3fbffbcbec88932d7c7b024aca5a1e26a36f13a4) --- sys/dev/hid/ietp.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/sys/dev/hid/ietp.c b/sys/dev/hid/ietp.c index a9d0295fb121..6a31423f61d8 100644 --- a/sys/dev/hid/ietp.c +++ b/sys/dev/hid/ietp.c @@ -450,13 +450,10 @@ ietp_iic_identify(driver_t *driver, device_t parent) { device_t iichid = device_get_parent(parent); static const uint16_t reg = IETP_PATTERN; - uint16_t addr = iicbus_get_addr(iichid) << 1; + uint16_t addr; uint8_t resp[2]; uint8_t cmd[2] = { reg & 0xff, (reg >> 8) & 0xff }; - struct iic_msg msgs[2] = { - { addr, IIC_M_WR | IIC_M_NOSTOP, sizeof(cmd), cmd }, - { addr, IIC_M_RD, sizeof(resp), resp }, - }; + struct iic_msg msgs[2]; struct iic_rdwr_data ird = { msgs, nitems(msgs) }; uint8_t pattern; @@ -466,6 +463,10 @@ ietp_iic_identify(driver_t *driver, device_t parent) if (device_get_devclass(iichid) != devclass_find("iichid")) return; + addr = iicbus_get_addr(iichid) << 1; + msgs[0] = (struct iic_msg){ addr, IIC_M_WR | IIC_M_NOSTOP, sizeof(cmd), cmd }; + msgs[1] = (struct iic_msg){ addr, IIC_M_RD, sizeof(resp), resp }; + DPRINTF("Read reg 0x%04x with size %zu\n", reg, sizeof(resp)); if (hid_ioctl(parent, I2CRDWR, (uintptr_t)&ird) != 0)