cgroup: Parse infinity properly for memory protections

Werkov · Werkov · commit 67e2baff6be8 · 2020-06-24T23:16:06.000+02:00
This fixes commit db2b8d2 that rectified parsing empty values but broke parsing explicit infinity. Intended parsing semantics will be captured in a testcase in a follow up commit. Ref: systemd#16248
diff --git a/src/core/load-fragment.c b/src/core/load-fragment.c
@@ -3427,13 +3427,12 @@ int config_parse_memory_limit(
         uint64_t bytes = CGROUP_LIMIT_MAX;
         int r;
 
-        if (STR_IN_SET(lvalue, "DefaultMemoryLow",
-                               "DefaultMemoryMin",
-                               "MemoryLow",
-                               "MemoryMin"))
+        if (isempty(rvalue) && STR_IN_SET(lvalue, "DefaultMemoryLow",
+                                                  "DefaultMemoryMin",
+                                                  "MemoryLow",
+                                                  "MemoryMin"))
                 bytes = CGROUP_LIMIT_MIN;
-
-        if (!isempty(rvalue) && !streq(rvalue, "infinity")) {
+        else if (!isempty(rvalue) && !streq(rvalue, "infinity")) {
 
                 r = parse_permille(rvalue);
                 if (r < 0) {
