From nobody Sat Jul 25 02:02:12 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 4h6Sm52K5Sz6lfjh for ; Sat, 25 Jul 2026 02:02:13 +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 4h6Sm51M6Wz3S8d for ; Sat, 25 Jul 2026 02:02:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1784944933; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dCSr0jjaEBi8LQZuxfzLwEAYHsGsn+5WpUD4qqQzCN0=; b=Xe8VcxaY1akAZqCLn/3buKnNt10NBQASvg+sM6bUcitzZvqSOIhyPh9Fx1zVKMQ4rK5yQJ LhzdYqxOc7+LWMUqWSYSgAJWgcyN8IwYbkWoS2y9n9l63foTL53+4l+tvvnwshIJU9GhHr Sez8ailVIr9waJHzwXHhXD7bTtwXyyQFxD5BWSZoN9KBiFrjxiwmCMaYYneYXU8S3LSVN7 Bbo9cFGh3hBrT6CVP9CVgB7TyLujSHHmOUteqv4FAEZSnDs5mz79fBttz3T1GdgwnWXN46 WuCztbYteECVD05HliUdnO2GSwOFLU/pV+iK7NgGad0grEU/HkmcMVh/b6sXog== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1784944933; a=rsa-sha256; cv=none; b=m9HBmHTWDF6KG/A+X4tQMqTlZileRI3IQ+SbVYfP4sPU3Jpnr42WCC0YLQSZ/f/0J0uJYQ fmWt2AhxMU7CjcX2XigGxqTsE5qsB326xTqqjRX/yB1A5pDIt/QikA+TakIlUq/Y7hNkvy J5cEZsqSLEN0aoZ2VT2WBZ5L2F39NhLCzppD0Ln2JcfNtNdNMKUb5tp09Z6OC3y7otu7NC Qe5dL9yFwh9zfA8MWEVJwjVmIEWQnjD36gzGT7E8KB09WQU60EShKVvn4Nl+YOhIPZSGNR K6p9zrdAqt7vYwIkt+CXi1eqt4DksGgicndJq7F6q32fDvlUEZIMwyvp4b7nCg== 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=1784944933; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dCSr0jjaEBi8LQZuxfzLwEAYHsGsn+5WpUD4qqQzCN0=; b=UmeJ14Ol5VIF4rX4XMy6MCD6EkXagpb+a5sHTrI8avx8+wwMmgdzEMrJ4b9BXD4rkX7yVJ iqxit4e4lM59anBO72ploCeid5jnVSVCq3uwWuPq59R2OYG7CHrcppw+Jb/+i1reK4TFBs vJU8DRo6v1b+afy0E8wmvDDV4+kwJZsGe1yyey+7ZBYGkEJzA4nss4XgrJogCkpLVA385C KeYvxltL9o+bH0Xi0fY/fn2fLZFXQpG9aKE/+1Zgh96U1JXsHiXn+jcXk5qGxzo6oV+iIK mId15sDmHTRWp3JHuaBRSdFXNCqdk/NInIUCJg4T1hszXBxH21x9xPQhUJnNHg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4h6Sm502xXz2rs for ; Sat, 25 Jul 2026 02:02:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 38b06 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 25 Jul 2026 02:02:12 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Abdelkader Boudih From: Adrian Chadd Subject: git: 3fbffbcbec88 - main - ietp: guard iicbus_get_addr with devclass check 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 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: adrian X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3fbffbcbec88932d7c7b024aca5a1e26a36f13a4 Auto-Submitted: auto-generated Date: Sat, 25 Jul 2026 02:02:12 +0000 Message-Id: <6a641924.38b06.1aef7f36@gitrepo.freebsd.org> The branch main has been updated by adrian: URL: https://cgit.FreeBSD.org/src/commit/?id=3fbffbcbec88932d7c7b024aca5a1e26a36f13a4 commit 3fbffbcbec88932d7c7b024aca5a1e26a36f13a4 Author: Abdelkader Boudih AuthorDate: 2026-07-25 01:28:44 +0000 Commit: Adrian Chadd CommitDate: 2026-07-25 02:01:54 +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 --- 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)