From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Sun, 20 May 2018 20:45:22 +0000 (+0200)
Subject: basic/journal-importer: reject any field names that journald would reject
X-Git-Tag: v239~172^2~10
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1e448731f51865184ba988b246d02823a9284d6c;p=thirdparty%2Fsystemd.git

basic/journal-importer: reject any field names that journald would reject

$ build-asan/fuzz-journal-remote test/fuzz-regressions/fuzz-journal-remote/crash-96dee870ea66d03e89ac321eee28ea63a9b9aa45
...
Ignoring invalid field: "S\020"
Ignoring invalid field: "S\020"
...

If the field name includes nul bytes, we won't print all of the name.
But that seems enough of a corner case to ignore.
---

diff --git a/src/basic/journal-importer.c b/src/basic/journal-importer.c
index 1d5f84af4d4..86aa834525e 100644
--- a/src/basic/journal-importer.c
+++ b/src/basic/journal-importer.c
@@ -14,6 +14,7 @@
 #include "io-util.h"
 #include "journal-file.h"
 #include "journal-importer.h"
+#include "journal-util.h"
 #include "parse-util.h"
 #include "string-util.h"
 #include "unaligned.h"
@@ -347,6 +348,16 @@ int journal_importer_process_data(JournalImporter *imp) {
                         /* chomp newline */
                         n--;
 
+                        if (!journal_field_valid(line, sep - line, true)) {
+                                char buf[64], *t;
+
+                                t = strndupa(line, sep - line);
+                                log_debug("Ignoring invalid field: \"%s\"",
+                                          cellescape(buf, t));
+
+                                return 0;
+                        }
+
                         r = iovw_put(&imp->iovw, line, n);
                         if (r < 0)
                                 return r;