shaba/systemd-stable
1
1
Fork 0
mirror of https://github.com/systemd/systemd-stable.git synced 2024-12-23 17:34:00 +03:00
Code

cryptsetup-generator: Don't mistake NULL input as OOM (#7688)

Browse Source 
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
This commit is contained in:
Jan Alexander Steffens 2017-12-18 14:47:18 +01:00 committed by Zbigniew Jędrzejewski-Szmek
parent 4dfdca3148
commit aff0b1fa7b
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/cryptsetup/cryptsetup-generator.c
View File

@ -107,7 +107,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();
r = generator_open_unit_file(arg_dest, NULL, n, &f);
@ -177,7 +177,7 @@ static int create_disk(
return r;
filtered_escaped = specifier_escape(filtered);
if (!filtered_escaped)
if (filtered && !filtered_escaped)
return log_oom();
fprintf(f,