From nobody Mon Sep 29 21:52:38 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 4cbFKg13sKz68v1T; Mon, 29 Sep 2025 21:52:39 +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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cbFKg0414z45pT; Mon, 29 Sep 2025 21:52:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759182759; 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=qPk3NtRyTo6IfJSr1mtO2OWQ2Iycrv3YPpbQbIQM1iY=; b=TTvXXyPIdD7o3ZeCXKd85NcbnhRvESjlKnr1bOpxFMXwyv8E/h74VZZYsXi318hNe3noVd KkmqSKY/Kno+Tzuq44EIPRaVtPqui4tG2XiOjFLWaoFkvJx4+nuleC3nT29BVwMoN7rwrd mKK0PgC2KTWm5T1zx6/js+KbggSu5sBJdmHDzyHEk+WpR8b3auW4HB1zTPWYuVHv1ukxB1 CtISGepdex03k+7BaQcYpJfZ2TmHG6zyXXbzCDqmPnLcMkyF0iXpWTBwl3i9mMc3KqmFRJ gnLY01+RmPp4uuFNZePpxv40aTlotWQTa26tvV6iXB8JIpo2pxmrlZm8zZ9rbw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759182759; 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=qPk3NtRyTo6IfJSr1mtO2OWQ2Iycrv3YPpbQbIQM1iY=; b=GTsHQZCgii7vMOCexbQZ3PcJ9EIqK+m6XeYRVgK11qDQwpyEcyU/vd0UqbsxnrPaEHRyfq 8h27rXyhbfWxhG3PUhzX0LMSjSY51IY9OMa1+rPOdLn0Nj9aaWI+/SfEkaQOA0t+TY8NLi WggwXpTk0uDp85kGIBXmoTIrzsX4Q8WMfiSt4uoMOcSBek3PyHvt9P/kHLmtYNOWdNOGLY Re3+C4BzaEFIWr26aDRfjb/X5BKH8bqIkGnxcxao/DzXEElhHFqNubrnlty3ewxmbEiClF P36xf4+Uc12dqpVUkqxhPDmJBTay/s3ZpvgQRJ7G306f5eXNcDjFpV5hH2cb0Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1759182759; a=rsa-sha256; cv=none; b=aN16YjSoeyfSuYS3l4fGzKn4QO4jZXw8tt9J0Y9NqQxyTfmvAtD2j/u8IRiFksFxtRQfAI FfJ8o8cekhpigLZ/8OaCMvctm51/0i2r0R/RaoY3dkiHyht+urjr8IIrLwIRQYkdRRsham AxzkdwemMybB195ev77SjK382r0JgzokUulOPCYovxyDXVmeCmnUJeJ3da+YpI6tsO6gED Wmj+SvchwpZ7qriy/hN+AIcK/yOVXHSbWNmdMVBZCDime0SHhU9gvy/jwoRcZQdEGet6lU IEjA3g0VkUjloYrzEMpx1I9/55uNqjgVClxEDiJxs1UbMLsuJ0db3/qhtL+9pQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4cbFKf6bybz1MXr; Mon, 29 Sep 2025 21:52:38 +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 58TLqc6Q051793; Mon, 29 Sep 2025 21:52:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 58TLqcX8051790; Mon, 29 Sep 2025 21:52:38 GMT (envelope-from git) Date: Mon, 29 Sep 2025 21:52:38 GMT Message-Id: <202509292152.58TLqcX8051790@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Vladimir Kondratyev Subject: git: 9c61c3f7e4b1 - stable/15 - iichid(4): Do not add 2 leading "length" bytes to input report length 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: wulf X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 9c61c3f7e4b1e6e68cddf6ac9ecc33ea11198ef6 Auto-Submitted: auto-generated The branch stable/15 has been updated by wulf: URL: https://cgit.FreeBSD.org/src/commit/?id=9c61c3f7e4b1e6e68cddf6ac9ecc33ea11198ef6 commit 9c61c3f7e4b1e6e68cddf6ac9ecc33ea11198ef6 Author: Vladimir Kondratyev AuthorDate: 2025-09-22 08:37:20 +0000 Commit: Vladimir Kondratyev CommitDate: 2025-09-29 21:51:07 +0000 iichid(4): Do not add 2 leading "length" bytes to input report length MFC after: 1 week fixes: 36027361f9cf ("iichid: Stop using split I²C bus transactions") (cherry picked from commit 1e74951b6cd8132ae417177336b7180e174a5e3f) --- sys/dev/iicbus/iichid.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/sys/dev/iicbus/iichid.c b/sys/dev/iicbus/iichid.c index 6d95d6d2d4f8..5ca3f1b84e48 100644 --- a/sys/dev/iicbus/iichid.c +++ b/sys/dev/iicbus/iichid.c @@ -540,7 +540,7 @@ iichid_sampling_task(void *context, int pending) error = iichid_cmd_read(sc, sc->intr_buf, sc->intr_bufsize, &actual); if (error == 0) { if (actual > 0) { - sc->intr_handler(sc->intr_ctx, sc->intr_buf + 2, actual); + sc->intr_handler(sc->intr_ctx, sc->intr_buf + 2, actual - 2); sc->missing_samples = 0; if (sc->dup_size != actual || memcmp(sc->dup_buf, sc->intr_buf, actual) != 0) { @@ -607,7 +607,7 @@ iichid_intr(void *context) if (sc->power_on && sc->open) { if (actual != 0) sc->intr_handler(sc->intr_ctx, sc->intr_buf + 2, - actual); + actual - 2); else DPRINTF(sc, "no data received\n"); } @@ -822,7 +822,7 @@ iichid_intr_setup(device_t dev, device_t child __unused, hid_intr_t intr, * report in the descriptor, and add two for the length field. */ rdesc->rdsize = rdesc->rdsize == 0 ? - le16toh(sc->desc.wMaxInputLength) : rdesc->isize + 2; + le16toh(sc->desc.wMaxInputLength) - 2 : rdesc->isize; /* Write and get/set_report sizes are limited by I2C-HID protocol. */ rdesc->grsize = rdesc->srsize = IICHID_SIZE_MAX; rdesc->wrsize = IICHID_SIZE_MAX; @@ -832,7 +832,7 @@ iichid_intr_setup(device_t dev, device_t child __unused, hid_intr_t intr, sc->intr_handler = intr; sc->intr_ctx = context; - sc->intr_bufsize = rdesc->rdsize; + sc->intr_bufsize = rdesc->rdsize + 2; sc->intr_buf = realloc(sc->intr_buf, sc->intr_bufsize, M_DEVBUF, M_WAITOK | M_ZERO); #ifdef IICHID_SAMPLING @@ -1094,7 +1094,8 @@ iichid_probe(device_t dev) } if (le16toh(sc->desc.wHIDDescLength) != 30 || - le16toh(sc->desc.bcdVersion) != 0x100) { + le16toh(sc->desc.bcdVersion) != 0x100 || + le16toh(sc->desc.wMaxInputLength) < 2) { DPRINTF(sc, "HID descriptor is broken\n"); return (ENXIO); }