From nobody Wed Sep 17 12:19:08 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 4cRd9S5M1rz67HkF; Wed, 17 Sep 2025 12:19:08 +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 4cRd9S2DTrz3Vrh; Wed, 17 Sep 2025 12:19:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758111548; 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=g+8ZM7+z4UGZ0z7HOu7C87IvlIyYzBWY/qwIEuNCEVM=; b=U9ILsUf/kCzl+gbhyQ45s3qmowCQaDh45sapuySgWM0OKgQWkVc1XWOCnsDBN/mBFoox90 VOy/Rf4FixjdTlI80bBj5ZpXZbqpcxbYNOnZJzSyc6g5e+tNvcY9gRmq1JsS/Cj/MAQjYx Je2/mnaNZfh547NkG6ZKLsNppoJJTdh+cvqB63veOiCcgpHiCWG8dYCxfu6tt07cRzLcBO XeN4Ka3mhYG8WioMq9ibYnlb2/u7NN1jEjVX9ky+tVi2BBk16rHV79KQDurhWztzIRKdCD YUvOqPk5vaTof84ZKWTN75JJMvChG54u4MZavrV2GOXUhevPX9REq0Wk/8QbXw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758111548; 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=g+8ZM7+z4UGZ0z7HOu7C87IvlIyYzBWY/qwIEuNCEVM=; b=JQuFvospFhoIEmSEiqQFmYOaPozFmXVpKBmmWX8GrB4ooxD7nshj0GtX7ZZtAPOptt5OMG VlC4suqxG667qeMSdpkoa4ghJHEc/Y/AMTH7eVQw8SNM8jP92W6qWLQAlH6MWsnM2B8Bjp gu30U8WzyZ/3C3Uauz3aqPSXbi2GH6IhZ0f8A+yj/InNPTJKMSTTl3caaecq/O7SLPO5KM ebX0VMd0PgTKNR3G5KKhpXk1/U7kjxWka4OFO8BinwmMytBtILt0fDfSu8wej2Ui442nWK 1RCD3lrnIwRAYvYCxhFhIlW/+t5TeyKda2UTYCZf4UinMO2U4UqtgxzP1g+WTw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1758111548; a=rsa-sha256; cv=none; b=c0Oke3dJ8zkbCoBcmQG9mksOkHx2qGZnw4AALppeMt2cVDErxialY58YE6Opmu71/P34DE WS50pc8XCIOo4TWpDWL4sCCl0fbcS+PB63B8LiEhJIh60n1POAd2nEEalBY2Tkm2nlmJnB Pi/8Q/RFDcxcu1wgcVCwxO4PYTwxDZvYt5W96LVw2BinfC4PsYmlXXZtb3zU6h/egvHqn1 lg5NIUm5Zcg6OUDM1J4ywW6eG95m5S3M4vWAm86asuzKEGC/qSb/mGeBQkmZvgbMT4BPI/ aRz5mBuug2jiLrsJ4cQI+IfuBpoab7+JiFu+SmyJapF+MGstQWBYnv/Y6/vECA== 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 4cRd9S1fqkz8yp; Wed, 17 Sep 2025 12:19:08 +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 58HCJ8qa085853; Wed, 17 Sep 2025 12:19:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 58HCJ8Ow085850; Wed, 17 Sep 2025 12:19:08 GMT (envelope-from git) Date: Wed, 17 Sep 2025 12:19:08 GMT Message-Id: <202509171219.58HCJ8Ow085850@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Olivier Certner Subject: git: bbdea7c9f4ae - main - linux: setgroups(): Fix the group number's upper limit 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: olce X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: bbdea7c9f4aeae26b35f842382df0203fcda24a5 Auto-Submitted: auto-generated The branch main has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=bbdea7c9f4aeae26b35f842382df0203fcda24a5 commit bbdea7c9f4aeae26b35f842382df0203fcda24a5 Author: Olivier Certner AuthorDate: 2025-08-28 16:58:53 +0000 Commit: Olivier Certner CommitDate: 2025-09-17 12:16:04 +0000 linux: setgroups(): Fix the group number's upper limit 'ngroups_max' is the maximum number of supplementary groups the system will accept, and this has not changed. Fixes: 9da2fe96ff2e ("kern: fix setgroups(2) and getgroups(2) to match other platforms") MFC after: 5 days MFC to: stable/15 Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D52277 --- sys/compat/linux/linux_misc.c | 2 +- sys/compat/linux/linux_uid16.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/compat/linux/linux_misc.c b/sys/compat/linux/linux_misc.c index 755eae057406..fb86de6e7302 100644 --- a/sys/compat/linux/linux_misc.c +++ b/sys/compat/linux/linux_misc.c @@ -1034,7 +1034,7 @@ linux_setgroups(struct thread *td, struct linux_setgroups_args *args) int error; struct proc *p; - if (ngrp < 0 || ngrp >= ngroups_max) + if (ngrp < 0 || ngrp > ngroups_max) return (EINVAL); linux_gidset = malloc(ngrp * sizeof(*linux_gidset), M_LINUX, M_WAITOK); error = copyin(args->grouplist, linux_gidset, ngrp * sizeof(l_gid_t)); diff --git a/sys/compat/linux/linux_uid16.c b/sys/compat/linux/linux_uid16.c index 07430f5b399b..dd681f971746 100644 --- a/sys/compat/linux/linux_uid16.c +++ b/sys/compat/linux/linux_uid16.c @@ -91,7 +91,7 @@ linux_setgroups16(struct thread *td, struct linux_setgroups16_args *args) int error; struct proc *p; - if (ngrp < 0 || ngrp >= ngroups_max) + if (ngrp < 0 || ngrp > ngroups_max) return (EINVAL); linux_gidset = malloc(ngrp * sizeof(*linux_gidset), M_LINUX, M_WAITOK); error = copyin(args->gidset, linux_gidset, ngrp * sizeof(l_gid16_t));