From ae2173d66b8b9fc42f311d8586a3cf4abcc65a76 Mon Sep 17 00:00:00 2001 From: Zbigniew Jędrzejewski-Szmek Date: Thu, 20 Apr 2017 14:28:19 -0400 Subject: coredump: fix non-literal string used in printf This was exposed by the previous commit. This could be potentially unpleasant, but we are saved by the fact that this code path was only taken for journald crashes, where we control COMM and know that it doesn't contain any special characters. Use log_dispatch which does not do any format processing to push the message out. --- src/coredump/coredump.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'src/coredump/coredump.c') diff --git a/src/coredump/coredump.c b/src/coredump/coredump.c index 5828e949e3..e9ada8e6db 100644 --- a/src/coredump/coredump.c +++ b/src/coredump/coredump.c @@ -800,12 +800,11 @@ log: if (journald_crash) { /* We cannot log to the journal, so just print the MESSAGE. * The target was set previously to something safe. */ - log_struct(LOG_ERR, core_message, NULL); + log_dispatch(LOG_ERR, 0, core_message); return 0; } - if (core_message) - IOVEC_SET_STRING(iovec[n_iovec++], core_message); + IOVEC_SET_STRING(iovec[n_iovec++], core_message); if (truncated) IOVEC_SET_STRING(iovec[n_iovec++], "COREDUMP_TRUNCATED=1"); -- cgit v1.2.3-54-g00ecf