core/cgroup: accepts MemorySwapMax=0 (systemd#8366)

Also, this moves two macros from dbus-util.h to dbus-cgroup.c, as they are only used in dbus-cgroup.c. Fixes systemd#8363. (cherry picked from commit 906bdbf) [mkoutny: simplify range condition, we don't have 681ae88 ("dbus-cgroup: simplify bus_cgroup_set_property()") v237~157^2]
Werkov · Jul 9, 2020 · 23dcdb0 · 23dcdb0
1 parent f480087
commit 23dcdb0
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/src/core/dbus-cgroup.c b/src/core/dbus-cgroup.c
@@ -939,7 +939,7 @@ int bus_cgroup_set_property(
                 r = sd_bus_message_read(message, "t", &v);
                 if (r < 0)
                         return r;
-                if (v <= 0)
+                if (v <= 0 && !streq(name, "MemorySwapMax"))
                         return sd_bus_error_set_errnof(error, EINVAL, "%s= is too small", name);
 
                 if (mode != UNIT_CHECK) {
@@ -971,7 +971,7 @@ int bus_cgroup_set_property(
                         return r;
 
                 v = physical_memory_scale(raw, UINT32_MAX);
-                if (v <= 0 || v == UINT64_MAX)
+                if ((v <= 0 && !streq(name, "MemorySwapMaxScale")) || v == UINT64_MAX)
                         return sd_bus_error_set_errnof(error, EINVAL, "%s= is out of range", name);
 
                 if (mode != UNIT_CHECK) {

diff --git a/src/core/load-fragment.c b/src/core/load-fragment.c
@@ -3055,7 +3055,8 @@ int config_parse_memory_limit(
                 } else
                         bytes = physical_memory_scale(r, 100U);
 
-                if (bytes <= 0 || bytes >= UINT64_MAX) {
+                if (bytes >= UINT64_MAX ||
+                    (bytes <= 0 && !streq(lvalue, "MemorySwapMax"))) {
                         log_syntax(unit, LOG_ERR, filename, line, 0, "Memory limit '%s' out of range. Ignoring.", rvalue);
                         return 0;
                 }