From nobody Thu Sep 18 08:51:58 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 4cS8Wz2Fv7z681ss; Thu, 18 Sep 2025 08:51:59 +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 4cS8Wy5qvzz3hjc; Thu, 18 Sep 2025 08:51:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758185518; 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=Yr+U3vqsq2wdmdq//B4HNScZbW7Lbr6Qqu8IL9FM5is=; b=NGHvyFyxGPbvCpQ6IX0LmURQ9GD1CsYB1BwfJ62vDtXAQjy6iOrHsKxo62XmUvFLWyVD4O rqoYGDyXxGqSplCAK0tjdFAx/PbMIwnVgRw7vNeGE5U2P5bSCW4+QzEfvXOLq9Mcz3e/T5 PJY9b4wWdZldYslPRbLgzjKzaae/LCNJeHzY4Ni3VP9jHP/U6lhVRLSJRwpYQMG+Unv0uy Tgxc42KqrMv2C/LEiM2/0g3lYEqEhscg55dOXO+/1jemfmRfFFSeTcxKV98ql88btmblzK NdO8KYuR8hM8/jQWjJX48DJP+PzJ6FuES5Iv0H1USPuT7x9KbGLh43lcmjhaQA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758185518; 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=Yr+U3vqsq2wdmdq//B4HNScZbW7Lbr6Qqu8IL9FM5is=; b=x+0PBgYHW0JCEsb9hxMGh64kQgSJe8HTlO6li/zo1Yux+uZrBgLUbRAmuQ/HlSBi89SIXZ U5Kr69vUj8gfqG5NJeW23kYyRSu4eCfhvrXjPfKRK33leJpHRnN23jFA3jvXufN9Om6E4b /GrFJn2GstmG4+8PWKHIEwsi8oRU+PKZPmlWALZgbhbH4/lxGtt729Y3s2JVjB3FWcAY6v fK8q7qcFL90W3zISFqKL1SJJQDt5QdpmU0OKFNIXz2khg35ct0ryI3koaS6/tGmwO5zEr2 hrW1FcGU4in/ZqooQ9kmGGhiBt6nYrEQ/ifOO2DrTnmU7a8gfwVfR7/n8VaQ9A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1758185518; a=rsa-sha256; cv=none; b=x0arkgXQU4rMLqkHfiGPMx/pwmEqtEXtM6YWzHQTFf68+WsCkOd87DGYRNenDShyrHAMSQ v8zdXL5XDZBDdPtNNETT07LdTPrWVDlNMFOaPlFLIb8U2gd8nFt31YuTbtHPTmMcCJT60+ 6CDtcKL7PkQrFiWXfxUGNT3R/wumiK+ElAtKad5EMgxHme8h9kbwPoL11OM31L11eI+b+/ 3J+lbZ2MgarEUyP3Y4pQGDMUoBs3UnQposvR8dttgstp81c0ucFjgRstbMfkbLJGn3r0wi IoxOzRTtxr33b5vGdixyq/s5B0ppkdvYQ9ykNiWIK05pmynbJbXO1oXneE5XRw== 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 4cS8Wy55ndz14L4; Thu, 18 Sep 2025 08:51:58 +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 58I8pwhZ017369; Thu, 18 Sep 2025 08:51:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 58I8pwTZ017366; Thu, 18 Sep 2025 08:51:58 GMT (envelope-from git) Date: Thu, 18 Sep 2025 08:51:58 GMT Message-Id: <202509180851.58I8pwTZ017366@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: 97a56375caa5 - stable/15 - hwt: On attach, ensure owner is a target effective GID's member 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: 97a56375caa55b5e147117463224e6ddfc12c61e Auto-Submitted: auto-generated The branch stable/15 has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=97a56375caa55b5e147117463224e6ddfc12c61e commit 97a56375caa55b5e147117463224e6ddfc12c61e Author: Olivier Certner AuthorDate: 2025-08-26 10:05:15 +0000 Commit: Olivier Certner CommitDate: 2025-09-18 08:50:29 +0000 hwt: On attach, ensure owner is a target effective GID's member This restores a check that existed prior to commit be1f7435ef218b1d ("kern: start tracking cr_gid outside of cr_groups[]"). Fixes: be1f7435ef218b1d ("kern: start tracking cr_gid outside of cr_groups[]") MFC after: 9 days Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D52253 (cherry picked from commit d9e11f01ef076749e58614c03168e89f161dd978) --- sys/dev/hwt/hwt_ioctl.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/sys/dev/hwt/hwt_ioctl.c b/sys/dev/hwt/hwt_ioctl.c index 592db4931bb4..184c7e72f986 100644 --- a/sys/dev/hwt/hwt_ioctl.c +++ b/sys/dev/hwt/hwt_ioctl.c @@ -112,12 +112,11 @@ hwt_priv_check(struct proc *o, struct proc *t) error = EPERM; goto done; } - - /* Check the read and saved GIDs too. */ - if (!groupmember(tc->cr_rgid, oc) || + if (!groupmember(tc->cr_gid, oc) || + !groupmember(tc->cr_rgid, oc) || !groupmember(tc->cr_svgid, oc)) { - error = EPERM; - goto done; + error = EPERM; + goto done; } done: