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

Merge pull request #2040 from brauner/2017-12-14/bugfixes

Browse Source 
lxc_init: fix cgroup parsing
This commit is contained in:
Serge Hallyn 2017-12-14 20:10:39 -06:00 committed by GitHub
commit e44465303c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 52 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/lxc/Makefile.am
View File

@ -304,7 +304,7 @@ endif
if HAVE_STATIC_LIBCAP if HAVE_STATIC_LIBCAP
sbin_PROGRAMS += init.lxc.static sbin_PROGRAMS += init.lxc.static
init_lxc_static_SOURCES = lxc_init.c error.c log.c initutils.c caps.c init_lxc_static_SOURCES = lxc_init.c error.c log.c initutils.c caps.c parse.c
if !HAVE_GETLINE if !HAVE_GETLINE
if HAVE_FGETLN if HAVE_FGETLN

68
src/lxc/lxc_init.c
View File

@ -40,6 +40,7 @@
#include "error.h" #include "error.h"
#include "initutils.h" #include "initutils.h"
#include "log.h" #include "log.h"
#include "parse.h"
#include "version.h" #include "version.h"
/* option keys for long only options */ /* option keys for long only options */
@ -98,55 +99,64 @@ static struct arguments my_args = {
static void prevent_forking(void) static void prevent_forking(void)
{ {
FILE *f; FILE *f;
char name[MAXPATHLEN], path[MAXPATHLEN]; int fd = -1;
int ret; size_t len = 0;
char *line = NULL;
char path[MAXPATHLEN];
f = fopen("/proc/self/cgroup", "r"); f = fopen("/proc/self/cgroup", "r");
if (!f) { if (!f)
SYSERROR("Failed to open \"/proc/self/cgroup\"");
return; return;
}
while (!feof(f)) { while (getline(&line, &len, f) != -1) {
int fd, i; int ret;
char *p, *p2;
if (1 != fscanf(f, "%*d:%" QUOTEVAL(MAXPATHLEN) "s", name)) { p = strchr(line, ':');
ERROR("Failed to parse \"/proc/self/cgroup\""); if (!p)
goto out; continue;
} p++;
path[0] = 0; p2 = strchr(p, ':');
if (!p2)
continue;
*p2 = '\0';
for (i = 0; i < sizeof(name); i++) { /* This is a cgroup v2 entry. Skip it. */
if (name[i] == ':') { if ((p2 - p) == 0)
name[i] = 0;
strncpy(path, name + i + 1, sizeof(path));
break;
}
}
if (strcmp(name, "pids"))
continue; continue;
ret = snprintf(name, sizeof(name), "/sys/fs/cgroup/pids/%s/pids.max", path); if (strcmp(p, "pids") != 0)
continue;
p2++;
p2 += lxc_char_left_gc(p2, strlen(p2));
p2[lxc_char_right_gc(p2, strlen(p2))] = '\0';
ret = snprintf(path, sizeof(path),
"/sys/fs/cgroup/pids/%s/pids.max", p2);
if (ret < 0 || (size_t)ret >= sizeof(path)) { if (ret < 0 || (size_t)ret >= sizeof(path)) {
ERROR("Failed to create string"); ERROR("Failed to create string");
goto out; goto on_error;
} }
fd = open(name, O_WRONLY); fd = open(path, O_WRONLY);
if (fd < 0) { if (fd < 0) {
SYSERROR("Failed to open \"%s\"", name); SYSERROR("Failed to open \"%s\"", path);
goto out; goto on_error;
} }
if (write(fd, "1", 1) != 1) if (write(fd, "1", 1) != 1)
SYSERROR("Failed to write to \"%s\"", name); SYSERROR("Failed to write to \"%s\"", path);
close(fd); close(fd);
fd = -1;
break; break;
} }
out: on_error:
if (fd >= 0)
close(fd);
free(line);
fclose(f); fclose(f);
} }
@ -419,8 +429,6 @@ out:
exit(ret); exit(ret);
} }
static void print_usage(const struct option longopts[]) static void print_usage(const struct option longopts[])
{ {

17
src/lxc/tools/lxc_execute.c
View File

@ -63,10 +63,19 @@ static int my_parser(struct lxc_arguments* args, int c, char* arg)
case 'g': case 'g':
if (lxc_safe_uint(arg, &args->gid) < 0) if (lxc_safe_uint(arg, &args->gid) < 0)
return -1; return -1;
case OPT_SHARE_NET: args->share_ns[LXC_NS_NET] = arg; break; break;
case OPT_SHARE_IPC: args->share_ns[LXC_NS_IPC] = arg; break; case OPT_SHARE_NET:
case OPT_SHARE_UTS: args->share_ns[LXC_NS_UTS] = arg; break; args->share_ns[LXC_NS_NET] = arg;
case OPT_SHARE_PID: args->share_ns[LXC_NS_PID] = arg; break; break;
case OPT_SHARE_IPC:
args->share_ns[LXC_NS_IPC] = arg;
break;
case OPT_SHARE_UTS:
args->share_ns[LXC_NS_UTS] = arg;
break;
case OPT_SHARE_PID:
args->share_ns[LXC_NS_PID] = arg;
break;
} }
return 0; return 0;
} }