From: Lennart Poettering <lennart@poettering.net>
Date: Mon, 25 Oct 2021 08:39:12 +0000 (+0200)
Subject: cgroup: handle gracefully if we can't read oom_kill cgroup attribute
X-Git-Tag: v250-rc1~433^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=fc594dee9848292ed381ab4e5be82f583c4fe7be;p=thirdparty%2Fsystemd.git

cgroup: handle gracefully if we can't read oom_kill cgroup attribute
---

diff --git a/src/core/cgroup.c b/src/core/cgroup.c
index 931b31e2e18..3c4602d0962 100644
--- a/src/core/cgroup.c
+++ b/src/core/cgroup.c
@@ -3043,12 +3043,15 @@ int unit_check_oom(Unit *u) {
                 return 0;
 
         r = cg_get_keyed_attribute("memory", u->cgroup_path, "memory.events", STRV_MAKE("oom_kill"), &oom_kill);
-        if (r < 0)
+        if (IN_SET(r, -ENOENT, -ENXIO)) /* Handle gracefully if cgroup or oom_kill attribute don't exist */
+                c = 0;
+        else if (r < 0)
                 return log_unit_debug_errno(u, r, "Failed to read oom_kill field of memory.events cgroup attribute: %m");
-
-        r = safe_atou64(oom_kill, &c);
-        if (r < 0)
-                return log_unit_debug_errno(u, r, "Failed to parse oom_kill field: %m");
+        else {
+                r = safe_atou64(oom_kill, &c);
+                if (r < 0)
+                        return log_unit_debug_errno(u, r, "Failed to parse oom_kill field: %m");
+        }
 
         increased = c > u->oom_kill_last;
         u->oom_kill_last = c;