From: Lennart Poettering <lennart@poettering.net>
Date: Mon, 28 Jan 2019 18:30:42 +0000 (+0100)
Subject: systemctl: add missing OOM checks
X-Git-Tag: v242-rc1~218^2~32
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9fc32cd9b3a8bbce64a0a48a0f186d367b7f88ce;p=thirdparty%2Fsystemd.git

systemctl: add missing OOM checks
---

diff --git a/src/systemctl/systemctl.c b/src/systemctl/systemctl.c
index f79121bc24f..d30b607c43e 100644
--- a/src/systemctl/systemctl.c
+++ b/src/systemctl/systemctl.c
@@ -3543,8 +3543,15 @@ static int load_kexec_kernel(void) {
                                        "Boot entry specifies multiple initrds, which is not supported currently.");
 
         kernel = path_join(e->root, e->kernel);
-        if (!strv_isempty(e->initrd))
+        if (!kernel)
+                return log_oom();
+
+        if (!strv_isempty(e->initrd)) {
                 initrd = path_join(e->root, *e->initrd);
+                if (!initrd)
+                        return log_oom();
+        }
+
         options = strv_join(e->options, " ");
         if (!options)
                 return log_oom();