journal: refuse data which contain invalid fields

Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=25353.

(cherry picked from commit f2bd032044ca3cd4b454dd0ba86719effcf34dc0)

diff --git a/src/journal/journal-file.c b/src/journal/journal-file.c
index c0aec6fe0ed558d22549f3ed98b1a8902dbe9d09..15336bef3eb2c3be6d8263f7e8781e5120affa68 100644 (file)
--- a/src/journal/journal-file.c
+++ b/src/journal/journal-file.c
@@ -1576,6 +1576,9 @@ static int journal_file_append_field(
         assert(f);
         assert(field && size > 0);
 
+        if (!journal_field_valid(field, size, true))
+                return -EBADMSG;
+
         hash = journal_file_hash_data(f, field, size);
 
         r = journal_file_find_field_object_with_hash(f, field, size, hash, &o, &p);

diff --git a/test/fuzz/fuzz-journal-remote/oss-fuzz-25353 b/test/fuzz/fuzz-journal-remote/oss-fuzz-25353
new file mode 100644 (file)
index 0000000..94e5fbb
Binary files /dev/null and b/test/fuzz/fuzz-journal-remote/oss-fuzz-25353 differ