proxmox-mirrors/mirror_lxc
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_lxc synced 2025-07-26 08:44:53 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix getgrgid() thread safe issue

Browse Source 
Signed-off-by: Donghwa Jeong <dh48.jeong@samsung.com>
This commit is contained in:
Donghwa Jeong 2018-06-14 19:06:11 +09:00
parent cb7aa5e8ca
commit 3de9fb4c2f
No known key found for this signature in database
GPG Key ID: 0BE2750EE612F372
2 changed files with 56 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/lxc/cmd/lxc_user_nic.c
View File

@ -153,7 +153,10 @@ static char **get_groupnames(void)
gid_t *group_ids; gid_t *group_ids;
int ret, i; int ret, i;
char **groupnames; char **groupnames;
struct group *gr; struct group grent;
struct group *grentp = NULL;
char *buf;
size_t bufsize;
ngroups = getgroups(0, NULL); ngroups = getgroups(0, NULL);
if (ngroups < 0) { if (ngroups < 0) {
@ -189,28 +192,48 @@ static char **get_groupnames(void)
return NULL; return NULL;
} }
bufsize = sysconf(_SC_GETGR_R_SIZE_MAX);
if (bufsize == -1)
bufsize = 1024;
buf = malloc(bufsize);
if (!buf) {
free(group_ids);
free_groupnames(groupnames);
usernic_error("Failed to allocate memory while getting group "
"names: %s\n",
strerror(errno));
return NULL;
}
memset(groupnames, 0, sizeof(char *) * (ngroups + 1)); memset(groupnames, 0, sizeof(char *) * (ngroups + 1));
for (i = 0; i < ngroups; i++) { for (i = 0; i < ngroups; i++) {
gr = getgrgid(group_ids[i]); ret = getgrgid_r(group_ids[i], &grent, buf, bufsize, &grentp);
if (!gr) { if (!grentp) {
usernic_error("Failed to get group name: %s\n", if (ret == 0)
strerror(errno)); usernic_error("%s", "Could not find matched group record\n");
usernic_error("Failed to get group name: %s(%u)\n",
strerror(errno), group_ids[i]);
free(buf);
free(group_ids); free(group_ids);
free_groupnames(groupnames); free_groupnames(groupnames);
return NULL; return NULL;
} }
groupnames[i] = strdup(gr->gr_name); groupnames[i] = strdup(grent.gr_name);
if (!groupnames[i]) { if (!groupnames[i]) {
usernic_error("Failed to copy group name \"%s\"", usernic_error("Failed to copy group name \"%s\"",
gr->gr_name); grent.gr_name);
free(buf);
free(group_ids); free(group_ids);
free_groupnames(groupnames); free_groupnames(groupnames);
return NULL; return NULL;
} }
} }
free(buf);
free(group_ids); free(group_ids);
return groupnames; return groupnames;

30
src/lxc/conf.c
View File

@ -4542,13 +4542,35 @@ static char *getuname(void)
/* not thread-safe, do not use from api without first forking */ /* not thread-safe, do not use from api without first forking */
static char *getgname(void) static char *getgname(void)
{ {
struct group *result; struct group grent;
struct group *grentp = NULL;
char *buf;
char *grname;
size_t bufsize;
int ret;
result = getgrgid(getegid()); bufsize = sysconf(_SC_GETGR_R_SIZE_MAX);
if (!result) if (bufsize == -1)
bufsize = 1024;
buf = malloc(bufsize);
if (!buf)
return NULL; return NULL;
return strdup(result->gr_name); ret = getgrgid_r(getegid(), &grent, buf, bufsize, &grentp);
if (!grentp) {
if (ret == 0)
WARN("Could not find matched group record");
ERROR("Failed to get group record - %u", getegid());
free(buf);
return NULL;
}
grname = strdup(grent.gr_name);
free(buf);
return grname;
} }
/* not thread-safe, do not use from api without first forking */ /* not thread-safe, do not use from api without first forking */