From 78bda28d1af94de37ebdeef15a89329f00f8c51b Mon Sep 17 00:00:00 2001 From: Christian Brauner Date: Sun, 8 Dec 2019 00:35:19 +0100 Subject: [PATCH] cgroups/cgfsng: rework cgfsng_attach() Signed-off-by: Christian Brauner --- src/lxc/cgroups/cgfsng.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/src/lxc/cgroups/cgfsng.c b/src/lxc/cgroups/cgfsng.c index 2f6c3e2fd..ec826c19e 100644 --- a/src/lxc/cgroups/cgfsng.c +++ b/src/lxc/cgroups/cgfsng.c @@ -2303,6 +2303,9 @@ __cgfsng_ops static bool cgfsng_attach(struct cgroup_ops *ops, const char *name, int len, ret; char pidstr[INTTYPE_TO_STRLEN(pid_t)]; + if (!ops) + return ret_set_errno(false, ENOENT); + if (!ops->hierarchies) return true; @@ -2330,10 +2333,10 @@ __cgfsng_ops static bool cgfsng_attach(struct cgroup_ops *ops, const char *name, fullpath = build_full_cgpath_from_monitorpath(h, path, "cgroup.procs"); ret = lxc_write_to_file(fullpath, pidstr, len, false, 0666); - if (ret < 0) { - SYSERROR("Failed to attach %d to %s", (int)pid, fullpath); - return false; - } + if (ret < 0) + return log_error_errno(false, errno, + "Failed to attach %d to %s", + (int)pid, fullpath); } return true; -- 2.47.3