diff options
Diffstat (limited to 'src/journal')
-rw-r--r-- | src/journal/coredump.c | 12 | ||||
-rw-r--r-- | src/journal/journald-native.c | 2 |
2 files changed, 7 insertions, 7 deletions
diff --git a/src/journal/coredump.c b/src/journal/coredump.c index be45a684e5..8678ec6a59 100644 --- a/src/journal/coredump.c +++ b/src/journal/coredump.c @@ -306,9 +306,9 @@ static int save_external_coredump( if (r < 0) return log_error_errno(r, "Failed to determine coredump file name: %m"); - tmp = tempfn_random(fn); - if (!tmp) - return log_oom(); + r = tempfn_random(fn, &tmp); + if (r < 0) + return log_error_errno(r, "Failed to determine temporary file name: %m"); mkdir_p_label("/var/lib/systemd/coredump", 0755); @@ -352,9 +352,9 @@ static int save_external_coredump( goto uncompressed; } - tmp_compressed = tempfn_random(fn_compressed); - if (!tmp_compressed) { - log_oom(); + r = tempfn_random(fn_compressed, &tmp_compressed); + if (r < 0) { + log_error_errno(r, "Failed to determine temporary file name for %s: %m", fn_compressed); goto uncompressed; } diff --git a/src/journal/journald-native.c b/src/journal/journald-native.c index f982696255..f701233bbe 100644 --- a/src/journal/journald-native.c +++ b/src/journal/journald-native.c @@ -350,7 +350,7 @@ void server_process_native_file( return; } - if (!filename_is_safe(e)) { + if (!filename_is_valid(e)) { log_error("Received file in subdirectory of allowed directories. Refusing."); return; } |