summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRenaud Métrich <rmetrich@redhat.com>2019-09-13 11:18:18 +0200
committerThe Plumber <50238977+systemd-rhel-bot@users.noreply.github.com>2019-10-21 16:21:44 +0200
commite1bd03e75860fb349a6de589bbb1274acc454aef (patch)
tree96c844b9a4e8e04260d296c747b8cc24bdd48d5f
parentd6210c3d053d70175d72ed1d1719497eed76000b (diff)
downloadsystemd-e1bd03e75860fb349a6de589bbb1274acc454aef.tar.gz
Call getgroups() to know size of supplementary groups array to allocate
Resolves RHBZ #1743230 - journalctl dumps core when stack limit is reduced to 256 KB (cherry picked from commit f5e0b942af1e86993c21f4e5c84342bb10403dac) Resolves: #1743235
-rw-r--r--src/basic/user-util.c14
1 files changed, 8 insertions, 6 deletions
diff --git a/src/basic/user-util.c b/src/basic/user-util.c
index a562a397c7..c533f67025 100644
--- a/src/basic/user-util.c
+++ b/src/basic/user-util.c
@@ -358,9 +358,8 @@ char* gid_to_name(gid_t gid) {
}
int in_gid(gid_t gid) {
- long ngroups_max;
gid_t *gids;
- int r, i;
+ int ngroups, r, i;
if (getgid() == gid)
return 1;
@@ -371,12 +370,15 @@ int in_gid(gid_t gid) {
if (!gid_is_valid(gid))
return -EINVAL;
- ngroups_max = sysconf(_SC_NGROUPS_MAX);
- assert(ngroups_max > 0);
+ ngroups = getgroups(0, NULL);
+ if (ngroups < 0)
+ return -errno;
+ if (ngroups == 0)
+ return 0;
- gids = newa(gid_t, ngroups_max);
+ gids = newa(gid_t, ngroups);
- r = getgroups(ngroups_max, gids);
+ r = getgroups(ngroups, gids);
if (r < 0)
return -errno;