From nobody Wed Apr 30 07:49:18 2025 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 4ZnTpl0cv5z5v37L; Wed, 30 Apr 2025 07:49:19 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZnTpk2VvGz3GPn; Wed, 30 Apr 2025 07:49:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1745999358; 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=1WWh2Lc5u4DeWULcRzuLcnwyc1+VO4nY7Imrpn/F40U=; b=QdNsH9CP63Un5bFLfTEXnfCjeq3k0a0CSE4SDos+d9NpQcdQQMteFDhe9rnZtyWJkEAQ5q JUnr/e7jEZnjqSNohsd8QeZ6wfY/xkdy7XSTcsjeLsAtoEv8nzXEJbqpyUkLFurU0RQA78 JsSBiWcl3bVYuoXOEaQantgjSC3DPC9hZ3I9BbO/ple6bLMVPW7aEmGutGo07qFFb3PamY 1wpE+gjOIkMM4Tb6cU14KUaXapSeXhabDgq4PCUdsSJBbalzqN4rWEwFs2EiCtCzipUQc8 cCZ0EKlUTgVkhXILplV1TPIzD6WIGWEFNCchA1pyRHKCRBBsCrSgU25AaZFrtQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1745999358; a=rsa-sha256; cv=none; b=OHWFN8abiX/tTXjDthlUWbngWI6tw3PyrX9bI6hjDxxcWm9SHnL8oy9JDYTeML7cb39EgV qiJ9ifz761DNsOYRtBYxbnOkfNV8PxLsT5e6kNEUlvnwG9mwfp2/stGs2HI2E3ygISjR0P 2dj2nF8OpZ/iVm64Epsh3Hh2vyqIIJWiQRBqyBRJkflOvpxA3qijgzFzl5GvkpT6+wm+/t dXDPH5t1RZzsOBQh31tt/2aD4/FHjdWjnuu8c72iVxMojaxngnBCti37hJG+CFq1i9amHS EAAZ0GLs1qb3lhy8gfCPS9VJcNwcVQzyjEPATouk8HBmCnfqq0PLs2ukz/GeGw== 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=1745999358; 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=1WWh2Lc5u4DeWULcRzuLcnwyc1+VO4nY7Imrpn/F40U=; b=NDnF1NbkpNfkL9FZEn4eO2A2fdgJDjbZG8AonmrIV6AuL7ao1VBnKa1hzyqcY8plSwOXMt QooDMFREHAo62Hk3Us1/+lwyOzGZWGt9bB8XRLGPvoJ+DjUNqTm2AdC8pFSI1c1yKcj03S FGp9s6u2Ucal/nqmkKKpOTq826Yb1DQ3dFotUt7neBBC88D8IT/2Ex0L1fnO2c2FK7SM8N lT6ewzU9SkeQTSwwtmLP7uSfJ2Xvw3wteTJpiH8A0FgSryLgNWAcjOVOL/IYhipknqZnzX fg+Cfi6ZeezdBATJG3pMcm6oEpWzPGuQfrw3Io2Vq9U5BNxrfz1kNhvSTJ1grQ== 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 4ZnTpk245yzx7t; Wed, 30 Apr 2025 07:49:18 +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 53U7nIwp011300; Wed, 30 Apr 2025 07:49:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 53U7nI1P011297; Wed, 30 Apr 2025 07:49:18 GMT (envelope-from git) Date: Wed, 30 Apr 2025 07:49:18 GMT Message-Id: <202504300749.53U7nI1P011297@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: d04cc28f9759 - stable/14 - hidraw(4): Return actual length of read data from HIDIOCG* ioctls 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 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/14 X-Git-Reftype: branch X-Git-Commit: d04cc28f9759829a74db30d067be8a5c5e304c8d Auto-Submitted: auto-generated The branch stable/14 has been updated by wulf: URL: https://cgit.FreeBSD.org/src/commit/?id=d04cc28f9759829a74db30d067be8a5c5e304c8d commit d04cc28f9759829a74db30d067be8a5c5e304c8d Author: Vladimir Kondratyev AuthorDate: 2025-04-27 09:07:35 +0000 Commit: Vladimir Kondratyev CommitDate: 2025-04-30 07:32:23 +0000 hidraw(4): Return actual length of read data from HIDIOCG* ioctls To match Linux. MFC after: 3 days (cherry picked from commit 8d4d08d571c64d8f040c2cd1d8f98844251a2238) --- sys/dev/hid/hidraw.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/sys/dev/hid/hidraw.c b/sys/dev/hid/hidraw.c index f573b3db1391..c9d29b836d43 100644 --- a/sys/dev/hid/hidraw.c +++ b/sys/dev/hid/hidraw.c @@ -915,8 +915,14 @@ hidraw_ioctl(struct cdev *dev, u_long cmd, caddr_t addr, int flag, default: panic("Invalid report type"); } - return (hid_get_report(sc->sc_dev, addr, len, NULL, - reptype, id)); + error = hid_get_report(sc->sc_dev, addr, len, &actsize, + reptype, id); + if (error == 0) { + if (id == 0) + actsize++; + td->td_retval[0] = actsize; + } + return (error); case HIDIOCGRAWUNIQ(0): strlcpy(addr, sc->sc_hw->serial, len);