From nobody Tue Sep 23 12:03:55 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 4cWJY827Vlz68YTl; Tue, 23 Sep 2025 12:03:56 +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 4cWJY75Fmmz3FWx; Tue, 23 Sep 2025 12:03:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758629035; 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=oAnlJRqrOi7rE6EStSjz6BJVgl+btzlCLBSU69uZ5fY=; b=SdQ08qAbTSXznrGiy3S/31bA3on0m19WmcO4GC27+Kj/G40Y8HMEEQ+MmK6o9fn2hWaDHe v6Sv7f7/QV0BQUabRo5sfAjEJ8/GNaDzj97WXz0CfGwa25uJ9Pom8NiQsMTguZsb07F7w/ ogNp1JA9mDrwxlbexq9/LVm09gjQwSr/iDfGGieVqwwfJnEjbD1EUkNWA4cL0XbVnQuF6L v3Qgd8y9Grav34GI0xYc8J7wQU30w6iVRKBLmYIJ3SxD0I7LngYnLvuk94ChYpf/hgBmh5 ZLTgZ/4RbpNvkGl9xCaS/gc9Z5XyvMqaGy++OlF+5eEgV+4PC7nzDQrwHqX+BQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758629035; 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=oAnlJRqrOi7rE6EStSjz6BJVgl+btzlCLBSU69uZ5fY=; b=dI/I9Tam2PaNhYI8WhvR6wYkS5ZcrcXPoDIlS7Mgv/gBvnOU3BcmHzhP0k6AOVrEedWp4j jRQ38+XK+35rSAE9+neDAC/H160ZdUM4yO2nEfnIpOmb6qIiqMOCZAQj7gCqgK6orVmIkz mmlNtxlVIX5jHBZd3MuOh+siGMTGPN9rlo5XdLKDU+ThoS6xON2bIVJ0M6zgVxh7rJnQQ7 NM9v9NSnWDxuSToko7DLI/vbMn9va/H7B62OJElESgShqgkWu4KcvZk+jO1JkLu32r0B8f jjMYT/tHiFIl0ROGl6UksagCdrirgOmjrkVMPI9/iU7HqcaCvqw9PIJkr3NGEQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1758629035; a=rsa-sha256; cv=none; b=Pzk9P9kUTw2p8RPTyfUXgQwyiDW+fYlDvYrEJoZCtK21yOp/kpUf6XCA9PP7B72yPSW2le NFteiLYv5vJ19ZRA6tDpiCSm8bw0c/0uOGsC6TIG005JRkY2lwXF0jNT3kjO+d5eU11p6F v7im1+0KSLHNoS7447tLoDS82kzo3NpUuQyP8/f8IPjAGyLu8vMNWfhv/rjOEIlM/mhkI/ gM6rWFAvN9aEXBHcUZCOlWogDQ9wnvY/17xazhO6Hc1AD+PW0LrIJ7qAocymns6vdenDv2 gs8HzlUng7sjqj6PoY4eihtEqGrvGxzFiSjxmqVGzEPHxNi70PR0OA6w7MX7Qw== 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 4cWJY74ZM3zlck; Tue, 23 Sep 2025 12:03:55 +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 58NC3tYF009166; Tue, 23 Sep 2025 12:03:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 58NC3tN0009163; Tue, 23 Sep 2025 12:03:55 GMT (envelope-from git) Date: Tue, 23 Sep 2025 12:03:55 GMT Message-Id: <202509231203.58NC3tN0009163@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Olivier Certner Subject: git: b0395b44974b - stable/15 - tools/regression/priv: Don't call setgroups() with the effective GID 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/stable/15 X-Git-Reftype: branch X-Git-Commit: b0395b44974b9b7b7d3c1ef4aea0394478bec1f9 Auto-Submitted: auto-generated The branch stable/15 has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=b0395b44974b9b7b7d3c1ef4aea0394478bec1f9 commit b0395b44974b9b7b7d3c1ef4aea0394478bec1f9 Author: Olivier Certner AuthorDate: 2025-08-29 17:00:07 +0000 Commit: Olivier Certner CommitDate: 2025-09-23 12:02:49 +0000 tools/regression/priv: Don't call setgroups() with the effective GID The 'setgroups(0, NULL);' stance works the same on all versions of FreeBSD, getting rid of all supplementary groups. The replaced code would force the effective GID to also be a supplementary group. Fixes: 9da2fe96ff2e ("kern: fix setgroups(2) and getgroups(2) to match other platforms") MFC after: 5 days Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D52289 (cherry picked from commit ff7252cdafbd9dab104a5e7b33b8bb84117a8789) --- tools/regression/priv/main.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/tools/regression/priv/main.c b/tools/regression/priv/main.c index dbcb5759f6b9..979e6ed65284 100644 --- a/tools/regression/priv/main.c +++ b/tools/regression/priv/main.c @@ -423,12 +423,10 @@ setup_file(const char *test, char *fpathp, uid_t uid, gid_t gid, mode_t mode) static void set_creds(const char *test, uid_t uid, gid_t gid) { - gid_t gids[1] = { gid }; - if (setgid(gid) < 0) err(-1, "test %s: setegid(%d)", test, gid); - if (setgroups(sizeof(gids)/sizeof(gid_t), gids) < 0) - err(-1, "test %s: setgroups(%d)", test, gid); + if (setgroups(0, NULL) < 0) + err(-1, "test %s: setgroups(NULL)", test); if (setuid(uid) < 0) err(-1, "test %s: seteuid(%d)", test, uid); }