daandemeyer / rpms / systemd

Forked from rpms/systemd 2 years ago
Clone
4fbe94
From 8bd791fb3a8e85063e297204bdef8004aacd22b1 Mon Sep 17 00:00:00 2001
4fbe94
From: Yu Watanabe <watanabe.yu+github@gmail.com>
4fbe94
Date: Wed, 8 Aug 2018 18:27:15 +0900
4fbe94
Subject: [PATCH] syslog: fix segfault in syslog_parse_priority()
4fbe94
4fbe94
(cherry picked from commit a5ee33b951cfa22db53d0274c9c6c0d9d4dae39d)
4fbe94
4fbe94
Resolves: #1761519
4fbe94
---
4fbe94
 src/basic/syslog-util.c           | 20 +++++++++++---------
4fbe94
 src/journal/test-journal-syslog.c | 20 ++++++++++++++++++++
4fbe94
 2 files changed, 31 insertions(+), 9 deletions(-)
4fbe94
4fbe94
diff --git a/src/basic/syslog-util.c b/src/basic/syslog-util.c
4fbe94
index 21461fa581..fe129482f3 100644
4fbe94
--- a/src/basic/syslog-util.c
4fbe94
+++ b/src/basic/syslog-util.c
4fbe94
@@ -10,7 +10,8 @@
4fbe94
 
4fbe94
 int syslog_parse_priority(const char **p, int *priority, bool with_facility) {
4fbe94
         int a = 0, b = 0, c = 0;
4fbe94
-        int k;
4fbe94
+        const char *end;
4fbe94
+        size_t k;
4fbe94
 
4fbe94
         assert(p);
4fbe94
         assert(*p);
4fbe94
@@ -19,21 +20,22 @@ int syslog_parse_priority(const char **p, int *priority, bool with_facility) {
4fbe94
         if ((*p)[0] != '<')
4fbe94
                 return 0;
4fbe94
 
4fbe94
-        if (!strchr(*p, '>'))
4fbe94
+        end = strchr(*p, '>');
4fbe94
+        if (!end)
4fbe94
                 return 0;
4fbe94
 
4fbe94
-        if ((*p)[2] == '>') {
4fbe94
+        k = end - *p;
4fbe94
+        assert(k > 0);
4fbe94
+
4fbe94
+        if (k == 2)
4fbe94
                 c = undecchar((*p)[1]);
4fbe94
-                k = 3;
4fbe94
-        } else if ((*p)[3] == '>') {
4fbe94
+        else if (k == 3) {
4fbe94
                 b = undecchar((*p)[1]);
4fbe94
                 c = undecchar((*p)[2]);
4fbe94
-                k = 4;
4fbe94
-        } else if ((*p)[4] == '>') {
4fbe94
+        } else if (k == 4) {
4fbe94
                 a = undecchar((*p)[1]);
4fbe94
                 b = undecchar((*p)[2]);
4fbe94
                 c = undecchar((*p)[3]);
4fbe94
-                k = 5;
4fbe94
         } else
4fbe94
                 return 0;
4fbe94
 
4fbe94
@@ -46,7 +48,7 @@ int syslog_parse_priority(const char **p, int *priority, bool with_facility) {
4fbe94
         else
4fbe94
                 *priority = (*priority & LOG_FACMASK) | c;
4fbe94
 
4fbe94
-        *p += k;
4fbe94
+        *p += k + 1;
4fbe94
         return 1;
4fbe94
 }
4fbe94
 
4fbe94
diff --git a/src/journal/test-journal-syslog.c b/src/journal/test-journal-syslog.c
4fbe94
index 7294cde032..120477cc9f 100644
4fbe94
--- a/src/journal/test-journal-syslog.c
4fbe94
+++ b/src/journal/test-journal-syslog.c
4fbe94
@@ -4,6 +4,7 @@
4fbe94
 #include "journald-syslog.h"
4fbe94
 #include "macro.h"
4fbe94
 #include "string-util.h"
4fbe94
+#include "syslog-util.h"
4fbe94
 
4fbe94
 static void test_syslog_parse_identifier(const char *str,
4fbe94
                                          const char *ident, const char *pid, const char *rest, int ret) {
4fbe94
@@ -19,6 +20,17 @@ static void test_syslog_parse_identifier(const char *str,
4fbe94
         assert_se(streq(buf, rest));
4fbe94
 }
4fbe94
 
4fbe94
+static void test_syslog_parse_priority(const char *str, int priority, int ret) {
4fbe94
+        const char *buf = str;
4fbe94
+        int priority2, ret2;
4fbe94
+
4fbe94
+        ret2 = syslog_parse_priority(&buf, &priority2, false);
4fbe94
+
4fbe94
+        assert_se(ret == ret2);
4fbe94
+        if (ret2 == 1)
4fbe94
+                assert_se(priority == priority2);
4fbe94
+}
4fbe94
+
4fbe94
 int main(void) {
4fbe94
         test_syslog_parse_identifier("pidu[111]: xxx", "pidu", "111", "xxx", 11);
4fbe94
         test_syslog_parse_identifier("pidu: xxx", "pidu", NULL, "xxx", 6);
4fbe94
@@ -33,5 +45,13 @@ int main(void) {
4fbe94
         test_syslog_parse_identifier("pidu: ", "pidu", NULL, "", 6);
4fbe94
         test_syslog_parse_identifier("pidu : ", NULL, NULL, "pidu : ", 0);
4fbe94
 
4fbe94
+        test_syslog_parse_priority("<>", 0, 0);
4fbe94
+        test_syslog_parse_priority("<>aaa", 0, 0);
4fbe94
+        test_syslog_parse_priority("<aaaa>", 0, 0);
4fbe94
+        test_syslog_parse_priority("<aaaa>aaa", 0, 0);
4fbe94
+        test_syslog_parse_priority(" <aaaa>", 0, 0);
4fbe94
+        test_syslog_parse_priority(" <aaaa>aaa", 0, 0);
4fbe94
+        /* TODO: add test cases of valid priorities */
4fbe94
+
4fbe94
         return 0;
4fbe94
 }