From e0f7296a6d537f0d2eb5fbc6d7f9e007d11d516a Mon Sep 17 00:00:00 2001 From: Jim Ferrigno Date: Wed, 11 Aug 2021 14:44:32 -0400 Subject: [PATCH 1/2] cgroups: fix cpu bitmasks Link: https://discuss.linuxcontainers.org/t/lxc-4-0-9-lxc-start-sigabrt-on-systems-with-defined-offline-cpus-and-a-total-number-of-cpus-divisible-by-32 Signed-off-by: Jim Ferrigno Signed-off-by: Christian Brauner --- src/lxc/cgroups/cgfsng.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/lxc/cgroups/cgfsng.c b/src/lxc/cgroups/cgfsng.c index 46754217c..317ff2581 100644 --- a/src/lxc/cgroups/cgfsng.c +++ b/src/lxc/cgroups/cgfsng.c @@ -596,7 +596,6 @@ static bool cpuset1_cpus_initialize(int dfd_parent, int dfd_child, if (maxposs < maxisol) maxposs = maxisol; - maxposs++; } else { TRACE("The path \""__ISOL_CPUS"\" to read isolated cpus from does not exist"); } @@ -615,7 +614,6 @@ static bool cpuset1_cpus_initialize(int dfd_parent, int dfd_child, if (maxposs < maxoffline) maxposs = maxoffline; - maxposs++; } else { TRACE("The path \""__OFFLINE_CPUS"\" to read offline cpus from does not exist"); } From 7e80755d0c53a247c897f09be06c1624b27e1c4a Mon Sep 17 00:00:00 2001 From: Christian Brauner Date: Thu, 12 Aug 2021 09:00:00 +0200 Subject: [PATCH 2/2] cgroups: s/calloc/zalloc/g Signed-off-by: Christian Brauner --- src/lxc/cgroups/cgfsng.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lxc/cgroups/cgfsng.c b/src/lxc/cgroups/cgfsng.c index 317ff2581..e57e816ea 100644 --- a/src/lxc/cgroups/cgfsng.c +++ b/src/lxc/cgroups/cgfsng.c @@ -215,7 +215,7 @@ static uint32_t *lxc_cpumask(char *buf, size_t nbits) size_t arrlen; arrlen = BITS_TO_LONGS(nbits); - bitarr = calloc(arrlen, sizeof(uint32_t)); + bitarr = zalloc(arrlen * sizeof(uint32_t)); if (!bitarr) return ret_set_errno(NULL, ENOMEM);