diff options
Diffstat (limited to 'sys-apps/systemd/files/236-0001-cryptsetup-generator-Don-t-mistake-NULL-input-as-OOM.patch')
-rw-r--r-- | sys-apps/systemd/files/236-0001-cryptsetup-generator-Don-t-mistake-NULL-input-as-OOM.patch | 49 |
1 files changed, 0 insertions, 49 deletions
diff --git a/sys-apps/systemd/files/236-0001-cryptsetup-generator-Don-t-mistake-NULL-input-as-OOM.patch b/sys-apps/systemd/files/236-0001-cryptsetup-generator-Don-t-mistake-NULL-input-as-OOM.patch deleted file mode 100644 index d1c451835e31..000000000000 --- a/sys-apps/systemd/files/236-0001-cryptsetup-generator-Don-t-mistake-NULL-input-as-OOM.patch +++ /dev/null @@ -1,49 +0,0 @@ -From 357ffd95294e1f9a1e91f8ca01213fb7db2b7614 Mon Sep 17 00:00:00 2001 -From: Jan Alexander Steffens <jan.steffens@gmail.com> -Date: Mon, 18 Dec 2017 14:47:18 +0100 -Subject: [PATCH] cryptsetup-generator: Don't mistake NULL input as OOM (#7688) - -Since systemd v236, several Arch users complained that -systemd-cryptsetup-generator exits with an OOM error and that it -prevents the boot from continuing. - -Investigating the diff of cryptsetup-generator between v235 and v236 I -noticed that create_disk allowed for the `password` and `filtered` -variables to be NULL (they're handled with `strempty()`) but not their -`*_escaped` versions, and returned OOM errors in those cases. - -Fix this by checking that the input string is non-NULL before deciding -that `specifier_escape` had an OOM error. - -I could not test this fix myself, but some users have reported success. - -Downstream bug: https://bugs.archlinux.org/task/56733 ---- - src/cryptsetup/cryptsetup-generator.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/cryptsetup/cryptsetup-generator.c b/src/cryptsetup/cryptsetup-generator.c -index 7e61332e5..f91451353 100644 ---- a/src/cryptsetup/cryptsetup-generator.c -+++ b/src/cryptsetup/cryptsetup-generator.c -@@ -111,7 +111,7 @@ static int create_disk( - return log_error_errno(r, "Failed to generate unit name: %m"); - - password_escaped = specifier_escape(password); -- if (!password_escaped) -+ if (password && !password_escaped) - return log_oom(); - - f = fopen(p, "wxe"); -@@ -184,7 +184,7 @@ static int create_disk( - return r; - - filtered_escaped = specifier_escape(filtered); -- if (!filtered_escaped) -+ if (filtered && !filtered_escaped) - return log_oom(); - - fprintf(f, --- -2.15.1 - |