From nobody Sun Dec 22 03:37:49 2024 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 4YG6L52zsfz5hx1v; Sun, 22 Dec 2024 03:37:49 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YG6L52SGnz4DMl; Sun, 22 Dec 2024 03:37:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734838669; 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=EbkaybhHcPuctrGqgrWx9Mjgv7SBXKqwhwi5+PkD6N4=; b=aSQAN9WBvnYzXnU6ORBHdlCpEGT7DjcxWFuglUqzeoapibpBLKxFrwnxRBhH99KpQ8SpmQ cExwcNIf/3Ba1LLzvU7/W7LXeyxofSWkOO2Qq0EJ9hm6V/xQum8Lm53I2hh+x+UrCYr5wt LhyI7B3NhBBaY6B8QD9F/yF5Xgh1FWX12qhGKqUrzFONu42NxRbBGAksW0hSAaWdQIFWTK olPdzxki7umG+YxWJ1KHAtbqfchTleYtzrHK6dFwXgu83KhYYMAlnG+N6qkTvTEzxYU+/Y 8W1WgvPAxzcmSikFwFApUx6lgVaOkMJDbzieF3oTeo+9Fh7dxhfSJ/WJnatCOw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734838669; 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=EbkaybhHcPuctrGqgrWx9Mjgv7SBXKqwhwi5+PkD6N4=; b=k/l+MUyeBfs3SnXgKRoYEl9njiTrvDRBniG8rj/vlkPLJDLdJ4SeZw4JAD3ETiO2pPfr11 jrXRSPo7ArVtxgae3It8hDPncfnAyzuk8rZQeNwFwp9dpSeekQG4oDs5TpIcCqAHzGC8Os 617h33m+YzOiquE7Cs+/z+AavHNCuJF7ocuL6ZPpUW00FjCGzPlHkkjgpf2ODeAGzV8PXN 4NcnB/wYHLZVnGobcLcKpVGBc0nNnYnc4rj7+keoue0z89iE3ryKhunQA1xf3Ipcs8K7AQ w+rsuWMO/Nu7u5ct5eqD2ryVm7V5sUB6MJkGENmqyuNzyVsFCfnMaotL+ijy8Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1734838669; a=rsa-sha256; cv=none; b=eWfxnZHie7M86iBQUF156xVCkF84/ChVJ+oWclSd8s0ZP6PvkaXqLkSh/S13hSkhyeqHFp 4C7MnjvIRt6OhczLnvHXRtT0HmjbXbO62fU4uiel49Zo3OFCEILmhR5WBl6ZUd0/39bge9 tdyWns4s/FblVOFb9lulqocE/zM+D4fd8x0efPhg95V5Rt8hNeYTySBioNHNuaFu59Jyu1 uNg2F+RbzLR1R5gNNsvm+MLqD0KM3C6HmfeTX8vjxwu/oPjMfc/YSn3uL4sMeawVowW2mt U0S0I2+apD58fKoryu1B0H7SV8VJ5Yz7xuWFtxr1jKrI0H7pOUFNIyL9nGAptA== 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 4YG6L521WkzrtW; Sun, 22 Dec 2024 03:37:49 +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 4BM3bnns052903; Sun, 22 Dec 2024 03:37:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BM3bn5x052900; Sun, 22 Dec 2024 03:37:49 GMT (envelope-from git) Date: Sun, 22 Dec 2024 03:37:49 GMT Message-Id: <202412220337.4BM3bn5x052900@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: 4bbc69192e4f - stable/14 - uhid(4): update ugd_actlen in USB_GET_REPORT ioctl 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/14 X-Git-Reftype: branch X-Git-Commit: 4bbc69192e4feea57198b5d00ec2b7e2f1b0579d Auto-Submitted: auto-generated The branch stable/14 has been updated by wulf: URL: https://cgit.FreeBSD.org/src/commit/?id=4bbc69192e4feea57198b5d00ec2b7e2f1b0579d commit 4bbc69192e4feea57198b5d00ec2b7e2f1b0579d Author: Matthew Nygard Dodd AuthorDate: 2024-11-18 04:15:01 +0000 Commit: Vladimir Kondratyev CommitDate: 2024-12-22 03:33:16 +0000 uhid(4): update ugd_actlen in USB_GET_REPORT ioctl USB_GET_REPORT ioctl is documented to update ugd_actlen on return with the number of bytes copied. It does not do this. Reviewed by: wulf PR: 282790 MFC after: 1 week (cherry picked from commit 0b5d86b38ae9aec92ef96b9227a404a2df3c9234) --- sys/dev/usb/input/uhid.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/sys/dev/usb/input/uhid.c b/sys/dev/usb/input/uhid.c index 863e04f4e52b..098ec4364df7 100644 --- a/sys/dev/usb/input/uhid.c +++ b/sys/dev/usb/input/uhid.c @@ -633,11 +633,13 @@ uhid_ioctl(struct usb_fifo *fifo, u_long cmd, void *addr, default: return (EINVAL); } + size = imin(ugd->ugd_maxlen, size); if (id != 0) error = copyin(ugd->ugd_data, &id, 1); if (error == 0) error = uhid_get_report(sc, ugd->ugd_report_type, id, - NULL, ugd->ugd_data, imin(ugd->ugd_maxlen, size)); + NULL, ugd->ugd_data, size); + ugd->ugd_actlen = size; break; case USB_SET_REPORT: