fix 'Out of memory' error on luks.key parsing

Fixes:

> systemd-cryptsetup-generator[134]: Out of memory.
> systemd-cryptsetup-generator[134]: Failed to parse kernel command line, ignoring: Cannot allocate memory

boot error when 'luks.key' or 'rd.luks.key' is used on kernel command
line.

diff --git a/cryptsetup_generator_cmdline_parsing.patch b/cryptsetup_generator_cmdline_parsing.patch
new file mode 100644 (file)
index 0000000..816c4ad
--- /dev/null
+++ b/cryptsetup_generator_cmdline_parsing.patch
@@ -0,0 +1,22 @@
+From c802a7306bdc3e82378a87acd9402bbabe9f6b28 Mon Sep 17 00:00:00 2001
+From: Jan Janssen <medhefgo@web.de>
+Date: Thu, 10 Sep 2015 10:23:49 +0200
+Subject: [PATCH] cryptsetup-generator: Properly check return code
+
+---
+ src/cryptsetup/cryptsetup-generator.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/cryptsetup/cryptsetup-generator.c b/src/cryptsetup/cryptsetup-generator.c
+index 6fad8ad..ab91afe 100644
+--- a/src/cryptsetup/cryptsetup-generator.c
++++ b/src/cryptsetup/cryptsetup-generator.c
+@@ -330,7 +330,7 @@ static int parse_proc_cmdline_item(const char *key, const char *value) {
+                         free(d->keyfile);
+                         d->keyfile = uuid_value;
+                         uuid_value = NULL;
+-                } else if (free_and_strdup(&arg_default_keyfile, value))
++                } else if (free_and_strdup(&arg_default_keyfile, value) < 0)
+                         return log_oom();
+ 
+         } else if (STR_IN_SET(key, "luks.name", "rd.luks.name") && value) {

diff --git a/systemd.spec b/systemd.spec
index a1066345dd3efca53f5232aedbfa5ade0c43b8a8..c7c52f146cf2c120fc2be0477bd07ff8ee00b870 100644 (file)
--- a/systemd.spec
+++ b/systemd.spec
@@ -79,6 +79,7 @@ Patch12:      uids_gids.patch
 Patch13:       sysctl.patch
 Patch14:       journal-gatewayd-fdopen.patch
 Patch15:       empty_notify_dos.patch
+Patch16:       cryptsetup_generator_cmdline_parsing.patch
 URL:           http://www.freedesktop.org/wiki/Software/systemd
 BuildRequires: acl-devel
 %{?with_audit:BuildRequires:   audit-libs-devel}
@@ -676,6 +677,8 @@ Uzupełnianie parametrów w zsh dla poleceń udev.
 %patch13 -p1
 %patch14 -p1
 %patch15 -p1
+%patch16 -p1
+
 cp -p %{SOURCE2} src/systemd_booted.c
 
 %build