]> git.ipfire.org Git - thirdparty/lxc.git/commitdiff
cgroups: fix armhf builds 3530/head
authorChristian Brauner <christian.brauner@ubuntu.com>
Tue, 25 Aug 2020 10:27:10 +0000 (12:27 +0200)
committerChristian Brauner <christian.brauner@ubuntu.com>
Tue, 25 Aug 2020 10:27:10 +0000 (12:27 +0200)
Link: https://launchpadlibrarian.net/494473462/buildlog_ubuntu-groovy-armhf.lxc_1%3A4.0.4-0ubuntu2_BUILDING.txt.gz
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
src/lxc/cgroups/cgfsng.c

index 3ab041e1f9fc86437629a83285fae03fc087b5ec..f508c63d36e67c83b550a20d22dfcc85cc0c10da 100644 (file)
@@ -2217,7 +2217,7 @@ static int cgroup_attach_leaf(const struct lxc_conf *conf, int unified_fd, pid_t
        do {
                bool rm = false;
                char attach_cgroup[STRLITERALLEN(".lxc-/cgroup.procs") + INTTYPE_TO_STRLEN(int) + 1];
-               char *slash;
+               char *slash = attach_cgroup;
 
                ret = snprintf(attach_cgroup, sizeof(attach_cgroup), ".lxc-%d/cgroup.procs", idx);
                if (ret < 0 || (size_t)ret >= sizeof(attach_cgroup))
@@ -2231,7 +2231,7 @@ static int cgroup_attach_leaf(const struct lxc_conf *conf, int unified_fd, pid_t
                if (ret < STRLITERALLEN(".lxc-/cgroup.procs"))
                        return log_error_errno(-EINVAL, EINVAL, "Unexpected short write would cause buffer-overrun");
 
-               slash = &attach_cgroup[ret] - STRLITERALLEN("/cgroup.procs");
+               slash += (ret - STRLITERALLEN("/cgroup.procs"));
                *slash = '\0';
 
                ret = mkdirat(unified_fd, attach_cgroup, 0755);