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

Merge pull request #3024 from avkvl/fix_groups_with_a_lot_of_members

Browse Source 
lxc-user-net: Failed to convert string " Failed to get group name" to integer
This commit is contained in:
Christian Brauner 2019-06-04 10:49:57 +02:00 committed by GitHub
commit 1eaa8c428a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 26 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -206,7 +206,28 @@ static char **get_groupnames(void)
}
for (i = 0; i < ngroups; i++) {
ret = getgrgid_r(group_ids[i], &grent, buf, bufsize, &grentp);
while ((ret = getgrgid_r(group_ids[i], &grent, buf, bufsize, &grentp)) == ERANGE) {
bufsize <<= 1;
if (bufsize > MAX_GRBUF_SIZE) {
usernic_error("Failed to get group members: %u\n",
group_ids[i]);
free(buf);
free(group_ids);
free_groupnames(groupnames);
return NULL;
}
char *new_buf = realloc(buf, bufsize);
if (!new_buf) {
usernic_error("Failed to allocate memory while getting group "
"names: %s\n",
strerror(errno));
free(buf);
free(group_ids);
free_groupnames(groupnames);
return NULL;
}
buf = new_buf;
}
if (!grentp) {
if (ret == 0)
usernic_error("%s", "Could not find matched group record\n");

4
src/lxc/utils.h
View File

@ -26,6 +26,10 @@
/* Properly support loop devices on 32bit systems. */
#define _FILE_OFFSET_BITS 64
#ifndef MAX_GRBUF_SIZE
#define MAX_GRBUF_SIZE 65536
#endif
#include <errno.h>
#include <linux/loop.h>
#include <linux/types.h>