projects
/
platform
/
upstream
/
systemd.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
8a1ef3b
)
systemctl: add missing OOM checks
author
Lennart Poettering
<lennart@poettering.net>
Mon, 28 Jan 2019 18:30:42 +0000
(19:30 +0100)
committer
Lennart Poettering
<lennart@poettering.net>
Fri, 1 Mar 2019 11:41:32 +0000
(12:41 +0100)
src/systemctl/systemctl.c
patch
|
blob
|
history
diff --git
a/src/systemctl/systemctl.c
b/src/systemctl/systemctl.c
index
f79121b
..
d30b607
100644
(file)
--- 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();