From nobody Sun Apr 27 09:09:06 2025 X-Original-To: dev-commits-src-main@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 4ZlgkC5SZKz5vXfC; Sun, 27 Apr 2025 09:09:07 +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 4ZlgkC2SWPz48WJ; Sun, 27 Apr 2025 09:09:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1745744947; 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=9HdGcTe+VYCsPRYSmyxItJ1//x/5/4GNiKI6teC4mXs=; b=Aoxg9yny743xjRxzDYfg/4Y0X6EjMw5MOzq0XQH8I5DFqgCuxjhIy408zmr7LBlOmjt8zB jplFEuZuys56I7a2IS/M3Kfx0hPzheaWFPxcVyquBr+iY72SCSKNfpUeVVANFxlB5dqo4h 3okZiLDRPOps5Rqeyroh16lczHjPHv7PFOaDsjqonhClWZ7iYeshOOmuN39lQSThtKzAqz uQOPgmWAKWLXv0eiV4JS5hatvcm4D33otuzjQrZ6YBnJF6RmHFk8hR/pJ0REZjd51lcYQc 6XG8UPXZBUjQPr/dWVccU7k0+vzNeGLHJ/3cR+48r2JvNreLd7YdinL4LTAW7A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1745744947; a=rsa-sha256; cv=none; b=ejMJKeaBBtIf4ged0R1UsKRdxjItVoi6ZYcIE/0sTtnTy6hDKR6wDM5Lt4hl6uaybkk1gI XUessOdlFl/XDyAbUofLWpgGJkaGlGCUzT5HNJ90P8ZTSivFTRv3zjCFXyX73V6kCL0/6X rC2ph645hy9cOdWLS1nwGjg3C0mJPO2bwg/WBrC4+uscetanGS83SIHlpxVQaXLTmtVOW3 4276sqrodQ8CHdVAWnwSw6iBTRXhNy8nG+0qE+L263/0Bvzja5Tb5K3YQumOQGWr1R259V DXJu62KUac5ZeMiImUkcWmHWrAscXDqnWtOip1SP84tl4U+YLGkDlfHBnK0OKQ== 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=1745744947; 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=9HdGcTe+VYCsPRYSmyxItJ1//x/5/4GNiKI6teC4mXs=; b=Ogm4LUAKnDzJtpOsREw5v+ptjeOnf8W2Khmf5/Qm2/KC/uIo7zO1DQyOr/KSNA7OoLFxKT xg/juqpTLsLZ+LfWrnJt6jlD/Yw4ZZB+5q2JgPTSlUMzgK6USucZhRhVMk5xGqHeNNkvta P6na79p57knh8Ym/RObNpf6201/koa03/eJhzWb30YA4ZcQv1r9aoptQ84Nf54OqcWd+b1 UBNgpRkWM1JkEjCiqW31fPRY+d7elTX5If6bSMLTpsUD/5WdqmwUSF6Hprpb3G1WLZIuk2 AwajPQbE2ATs3P9w4ER6iPFJWUVU4z1y/2QwDilvcHV0TFQ7IYsFPeZXnD9gZQ== 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 4ZlgkC07ljz10SW; Sun, 27 Apr 2025 09:09:07 +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 53R996hU053776; Sun, 27 Apr 2025 09:09:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 53R996Sf053773; Sun, 27 Apr 2025 09:09:06 GMT (envelope-from git) Date: Sun, 27 Apr 2025 09:09:06 GMT Message-Id: <202504270909.53R996Sf053773@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Vladimir Kondratyev Subject: git: 8d4d08d571c6 - main - hidraw(4): Return actual length of read data from HIDIOCG* ioctls List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 8d4d08d571c64d8f040c2cd1d8f98844251a2238 Auto-Submitted: auto-generated The branch main has been updated by wulf: URL: https://cgit.FreeBSD.org/src/commit/?id=8d4d08d571c64d8f040c2cd1d8f98844251a2238 commit 8d4d08d571c64d8f040c2cd1d8f98844251a2238 Author: Vladimir Kondratyev AuthorDate: 2025-04-27 09:07:35 +0000 Commit: Vladimir Kondratyev CommitDate: 2025-04-27 09:07:35 +0000 hidraw(4): Return actual length of read data from HIDIOCG* ioctls To match Linux. MFC after: 3 days --- 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);