File 0004-sd-journal-verify-that-object-start-with-t... of Package systemd

Overview Repositories Revisions Requests Users Attributes Meta

File 0004-sd-journal-verify-that-object-start-with-the-field-n.patch of Package systemd (Revision d6ed623c2f7c97a87bb3622504268b5d)

Currently displaying revision d6ed623c2f7c97a87bb3622504268b5d , Show latest

Based on 0f99f74a14ef193c1ebde687c5cc76e1d67b85ef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
Date: Tue, 26 Aug 2014 23:54:31 -0400
Subject: [PATCH] sd-journal: verify that object start with the field name

If the journal is corrupted, we might return an object that does
not start with the expected field name and/or is shorter than it
should.
---
 src/journal/sd-journal.c   |   15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git src/journal/sd-journal.c src/journal/sd-journal.c
index 80ff8fe..693707c 100644
--- src/journal/sd-journal.c
+++ src/journal/sd-journal.c
@@ -2571,6 +2571,21 @@ _public_ int sd_journal_enumerate_unique(sd_journal *j, const void **data, size_
                 if (r < 0)
                         return r;
 
+                /* Check if we have at least the field name and "=". */
+                if (ol <= k) {
+                        log_debug("%s:offset " OFSfmt ": object has size %zu, expected at least %zu",
+                                  j->unique_file->path, j->unique_offset,
+                                  ol, k + 1);
+                        return -EBADMSG;
+                }
+
+                if (memcmp(odata, j->unique_field, k) || ((const char*) odata)[k] != '=') {
+                        log_debug("%s:offset " OFSfmt ": object does not start with \"%s=\"",
+                                  j->unique_file->path, j->unique_offset,
+                                  j->unique_field);
+                        return -EBADMSG;
+                }
+
                 /* OK, now let's see if we already returned this data
                  * object by checking if it exists in the earlier
                  * traversed files. */
-- 
1.7.9.2

Places

File 0004-sd-journal-verify-that-object-start-with-the-field-n.patch of Package systemd (Revision d6ed623c2f7c97a87bb3622504268b5d)

Places