From 01e5fa0792a7435fd31bac38df4f3688261d77f5 Mon Sep 17 00:00:00 2001 From: Christian Brauner Date: Fri, 28 Jul 2017 06:17:01 +0200 Subject: [PATCH 1/2] lvm: check whether lxc.bdev.lvm.vg is set Signed-off-by: Christian Brauner --- src/lxc/bdev/lxclvm.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/lxc/bdev/lxclvm.c b/src/lxc/bdev/lxclvm.c index fdbd98707c..7b1cbd5d80 100644 --- a/src/lxc/bdev/lxclvm.c +++ b/src/lxc/bdev/lxclvm.c @@ -307,6 +307,11 @@ int lvm_clonepaths(struct bdev *orig, struct bdev *new, const char *oldname, return -1; } vg = lxc_global_config_value("lxc.bdev.lvm.vg"); + if (!vg) { + ERROR("The \"lxc.bdev.lvm.vg\" key is not set"); + return -1; + } + len = strlen("/dev/") + strlen(vg) + strlen(cname) + 4 + 2; new->src = malloc(len); if (new->src) From bb30b52a769cf172dd86fc1c4370f7b03e140038 Mon Sep 17 00:00:00 2001 From: Christian Brauner Date: Fri, 28 Jul 2017 06:17:28 +0200 Subject: [PATCH 2/2] cgroups: use tight scoping Signed-off-by: Christian Brauner --- src/lxc/cgroups/cgfsng.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/lxc/cgroups/cgfsng.c b/src/lxc/cgroups/cgfsng.c index c5a9fb32f5..af44554769 100644 --- a/src/lxc/cgroups/cgfsng.c +++ b/src/lxc/cgroups/cgfsng.c @@ -1315,7 +1315,7 @@ static inline bool cgfsng_create(void *hdata) { struct cgfsng_handler_data *d = hdata; char *tmp, *cgname, *offset; - int i, ret; + int i; int idx = 0; size_t len; @@ -1343,6 +1343,8 @@ static inline bool cgfsng_create(void *hdata) goto out_free; } if (idx) { + int ret; + ret = snprintf(offset, 5, "-%d", idx); if (ret < 0 || (size_t)ret >= 5) { FILE *f = fopen("/dev/null", "w");