From: Giuseppe Scrivano <gscrivan@redhat.com>
To: linux-kernel@vger.kernel.org
Cc: serge@hallyn.com, dwalsh@redhat.com,
christian.brauner@ubuntu.com, ebiederm@xmission.com
Subject: [RFC PATCH 3/3] proc: hide unknown groups in status
Date: Mon, 10 May 2021 15:00:11 +0200 [thread overview]
Message-ID: <20210510130011.1441834-4-gscrivan@redhat.com> (raw)
In-Reply-To: <20210510130011.1441834-1-gscrivan@redhat.com>
when the "shadow" mode is enabled for the user namespace, do not copy
to userspace the groups that are not mapped.
Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
---
fs/proc/array.c | 12 ++++++++++--
1 file changed, 10 insertions(+), 2 deletions(-)
diff --git a/fs/proc/array.c b/fs/proc/array.c
index 7ec59171f197..81dc733773d4 100644
--- a/fs/proc/array.c
+++ b/fs/proc/array.c
@@ -202,9 +202,17 @@ static inline void task_state(struct seq_file *m, struct pid_namespace *ns,
seq_puts(m, "\nGroups:\t");
group_info = cred->group_info;
- for (g = 0; g < group_info->ngroups; g++)
+ for (g = 0; g < group_info->ngroups; g++) {
+ gid_t gid = from_kgid(user_ns, group_info->gid[g]);
+
+ if (gid == (gid_t)-1) {
+ if (user_ns->flags & USERNS_SETGROUPS_SHADOW)
+ continue;
+ gid = overflowgid;
+ }
seq_put_decimal_ull(m, g ? " " : "",
- from_kgid_munged(user_ns, group_info->gid[g]));
+ gid);
+ }
put_cred(cred);
/* Trailing space shouldn't have been added in the first place. */
seq_putc(m, ' ');
--
2.31.1
next prev parent reply other threads:[~2021-05-10 13:06 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-05-10 13:00 [RFC PATCH 0/3] new mode 'shadow' for /proc/PID/setgroups Giuseppe Scrivano
2021-05-10 13:00 ` [RFC PATCH 1/3] setgroups: " Giuseppe Scrivano
2021-05-15 1:51 ` Serge E. Hallyn
2021-05-17 13:30 ` Giuseppe Scrivano
2021-05-17 14:33 ` Christian Brauner
2021-05-17 16:17 ` Serge E. Hallyn
2021-05-18 9:32 ` Christian Brauner
2021-05-17 19:00 ` Giuseppe Scrivano
2021-05-18 9:16 ` Christian Brauner
2021-05-21 14:03 ` Snaipe
2021-05-17 16:08 ` Serge E. Hallyn
2021-05-10 13:00 ` [RFC PATCH 2/3] getgroups: hide unknown groups Giuseppe Scrivano
2021-05-15 1:21 ` Serge E. Hallyn
2021-05-10 13:00 ` Giuseppe Scrivano [this message]
2021-05-15 1:24 ` [RFC PATCH 3/3] proc: hide unknown groups in status Serge E. Hallyn
2021-05-10 16:02 ` [RFC PATCH 0/3] new mode 'shadow' for /proc/PID/setgroups Snaipe
2021-05-21 15:16 ` Eric W. Biederman
2021-05-24 13:41 ` Giuseppe Scrivano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210510130011.1441834-4-gscrivan@redhat.com \
--to=gscrivan@redhat.com \
--cc=christian.brauner@ubuntu.com \
--cc=dwalsh@redhat.com \
--cc=ebiederm@xmission.com \
--cc=linux-kernel@vger.kernel.org \
--cc=serge@hallyn.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®