File _service:tar_scm:systemd-solve-that-rsyslog-rea... of Package systemd

File _service:tar_scm:systemd-solve-that-rsyslog-reads-journal-s-object-of.patch of Package systemd (Revision e231d000eb6f8fe451999f66cf42d78d)

Currently displaying revision e231d000eb6f8fe451999f66cf42d78d , Show latest

From 6aa35d7d911b6895043f222293703ef7cf60aca1 Mon Sep 17 00:00:00 2001
From: yefei25 <yefei25@huawei.com>
Date: Thu, 5 Mar 2020 21:45:36 +0800
Subject: [PATCH] systemd: solve that rsyslog reads journal's object of
size 0

Signed-off-by: yefei25 <yefei25@huawei.com>

---
 src/libsystemd/sd-journal/journal-file.c | 3 ++-
 src/libsystemd/sd-journal/sd-journal.c   | 9 +++++++---
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/libsystemd/sd-journal/journal-file.c b/src/libsystemd/sd-journal/journal-file.c
index 220717d..221f8c4 100644
--- a/src/libsystemd/sd-journal/journal-file.c
+++ b/src/libsystemd/sd-journal/journal-file.c
@@ -895,8 +895,9 @@ static int journal_file_check_object(JournalFile *f, uint64_t offset, Object *o)
                                                le64toh(o->tag.epoch), offset);
 
                 break;
+        default:
+                return -EBADMSG;
         }
-
         return 0;
 }
 
diff --git a/src/libsystemd/sd-journal/sd-journal.c b/src/libsystemd/sd-journal/sd-journal.c
index d08b51e..489144b 100644
--- a/src/libsystemd/sd-journal/sd-journal.c
+++ b/src/libsystemd/sd-journal/sd-journal.c
@@ -127,6 +127,10 @@ static void init_location(Location *l, LocationType type, JournalFile *f, Object
         assert(IN_SET(type, LOCATION_DISCRETE, LOCATION_SEEK));
         assert(f);
 
+        if(o->object.type != OBJECT_ENTRY || o->object.size == 0){
+            return;
+        }
+
         *l = (Location) {
                 .type = type,
                 .seqnum = le64toh(o->entry.seqnum),
@@ -856,7 +860,8 @@ static int real_journal_next(sd_journal *j, direction_t direction) {
                 return r;
 
         set_location(j, new_file, o);
-
+        if(o->object.size == 0)
+                return -EBADMSG;
         return 1;
 }
 
@@ -2300,7 +2305,7 @@ static int return_data(sd_journal *j, JournalFile *f, Object *o, const void **da
         assert(f);
 
         l = le64toh(READ_NOW(o->object.size));
-        if (l < offsetof(Object, data.payload))
+        if (l == 0 || o->object.type == 0 || l < offsetof(Object, data.payload))
                 return -EBADMSG;
         l -= offsetof(Object, data.payload);
 
-- 
2.19.1