|
 |
4fbe94 |
From f991a9c7644f3fb5155ff823600ba5a6ea403dc4 Mon Sep 17 00:00:00 2001
|
|
|
4fbe94 |
From: Evgeny Vereshchagin <evvers@ya.ru>
|
|
|
4fbe94 |
Date: Fri, 16 Nov 2018 21:23:56 +0100
|
|
|
4fbe94 |
Subject: [PATCH] tests: add a fuzzer for process_audit_string
|
|
|
4fbe94 |
|
|
|
4fbe94 |
(cherry picked from commit 090a20cfaf3d5439fa39c5d8df473b0cfef181dd)
|
|
|
4fbe94 |
|
|
|
4fbe94 |
Resolves: #1764560
|
|
|
4fbe94 |
---
|
|
|
4fbe94 |
src/fuzz/fuzz-journald-audit.c | 27 +++++++++++++++++++++++++++
|
|
|
4fbe94 |
src/fuzz/meson.build | 5 +++++
|
|
|
4fbe94 |
src/journal/journald-audit.c | 2 +-
|
|
|
4fbe94 |
src/journal/journald-audit.h | 2 ++
|
|
|
4fbe94 |
test/fuzz/fuzz-journald-audit/basic | 1 +
|
|
|
4fbe94 |
5 files changed, 36 insertions(+), 1 deletion(-)
|
|
|
4fbe94 |
create mode 100644 src/fuzz/fuzz-journald-audit.c
|
|
|
4fbe94 |
create mode 100644 test/fuzz/fuzz-journald-audit/basic
|
|
|
4fbe94 |
|
|
|
4fbe94 |
diff --git a/src/fuzz/fuzz-journald-audit.c b/src/fuzz/fuzz-journald-audit.c
|
|
|
4fbe94 |
new file mode 100644
|
|
|
4fbe94 |
index 0000000000..fe401c0d98
|
|
|
4fbe94 |
--- /dev/null
|
|
|
4fbe94 |
+++ b/src/fuzz/fuzz-journald-audit.c
|
|
|
4fbe94 |
@@ -0,0 +1,27 @@
|
|
|
4fbe94 |
+/* SPDX-License-Identifier: LGPL-2.1+ */
|
|
|
4fbe94 |
+
|
|
|
4fbe94 |
+#include "fuzz.h"
|
|
|
4fbe94 |
+#include "journald-audit.h"
|
|
|
4fbe94 |
+
|
|
|
4fbe94 |
+int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) {
|
|
|
4fbe94 |
+ Server s;
|
|
|
4fbe94 |
+ _cleanup_free_ char *buffer = NULL;
|
|
|
4fbe94 |
+
|
|
|
4fbe94 |
+ s = (Server) {
|
|
|
4fbe94 |
+ .syslog_fd = -1,
|
|
|
4fbe94 |
+ .native_fd = -1,
|
|
|
4fbe94 |
+ .stdout_fd = -1,
|
|
|
4fbe94 |
+ .dev_kmsg_fd = -1,
|
|
|
4fbe94 |
+ .audit_fd = -1,
|
|
|
4fbe94 |
+ .hostname_fd = -1,
|
|
|
4fbe94 |
+ .notify_fd = -1,
|
|
|
4fbe94 |
+ .storage = STORAGE_NONE,
|
|
|
4fbe94 |
+ };
|
|
|
4fbe94 |
+ assert_se(sd_event_default(&s.event) >= 0);
|
|
|
4fbe94 |
+ buffer = memdup_suffix0(data, size);
|
|
|
4fbe94 |
+ assert_se(buffer);
|
|
|
4fbe94 |
+ process_audit_string(&s, 0, buffer, size);
|
|
|
4fbe94 |
+ server_done(&s);
|
|
|
4fbe94 |
+
|
|
|
4fbe94 |
+ return 0;
|
|
|
4fbe94 |
+}
|
|
|
4fbe94 |
diff --git a/src/fuzz/meson.build b/src/fuzz/meson.build
|
|
|
4fbe94 |
index 0520e448a9..5548da3822 100644
|
|
|
4fbe94 |
--- a/src/fuzz/meson.build
|
|
|
4fbe94 |
+++ b/src/fuzz/meson.build
|
|
|
4fbe94 |
@@ -33,6 +33,11 @@ fuzzers += [
|
|
|
4fbe94 |
libshared],
|
|
|
4fbe94 |
[libmount]],
|
|
|
4fbe94 |
|
|
|
4fbe94 |
+ [['src/fuzz/fuzz-journald-audit.c'],
|
|
|
4fbe94 |
+ [libjournal_core,
|
|
|
4fbe94 |
+ libshared],
|
|
|
4fbe94 |
+ [libselinux]],
|
|
|
4fbe94 |
+
|
|
|
4fbe94 |
[['src/fuzz/fuzz-journald-kmsg.c'],
|
|
|
4fbe94 |
[libjournal_core,
|
|
|
4fbe94 |
libshared],
|
|
|
4fbe94 |
diff --git a/src/journal/journald-audit.c b/src/journal/journald-audit.c
|
|
|
4fbe94 |
index 87726684af..7810a0139a 100644
|
|
|
4fbe94 |
--- a/src/journal/journald-audit.c
|
|
|
4fbe94 |
+++ b/src/journal/journald-audit.c
|
|
|
4fbe94 |
@@ -313,7 +313,7 @@ static int map_all_fields(
|
|
|
4fbe94 |
}
|
|
|
4fbe94 |
}
|
|
|
4fbe94 |
|
|
|
4fbe94 |
-static void process_audit_string(Server *s, int type, const char *data, size_t size) {
|
|
|
4fbe94 |
+void process_audit_string(Server *s, int type, const char *data, size_t size) {
|
|
|
4fbe94 |
size_t n_iov_allocated = 0, n_iov = 0, z;
|
|
|
4fbe94 |
_cleanup_free_ struct iovec *iov = NULL;
|
|
|
4fbe94 |
uint64_t seconds, msec, id;
|
|
|
4fbe94 |
diff --git a/src/journal/journald-audit.h b/src/journal/journald-audit.h
|
|
|
4fbe94 |
index 57bb1711c9..7766618c98 100644
|
|
|
4fbe94 |
--- a/src/journal/journald-audit.h
|
|
|
4fbe94 |
+++ b/src/journal/journald-audit.h
|
|
|
4fbe94 |
@@ -6,4 +6,6 @@
|
|
|
4fbe94 |
|
|
|
4fbe94 |
void server_process_audit_message(Server *s, const void *buffer, size_t buffer_size, const struct ucred *ucred, const union sockaddr_union *sa, socklen_t salen);
|
|
|
4fbe94 |
|
|
|
4fbe94 |
+void process_audit_string(Server *s, int type, const char *data, size_t size);
|
|
|
4fbe94 |
+
|
|
|
4fbe94 |
int server_open_audit(Server*s);
|
|
|
4fbe94 |
diff --git a/test/fuzz/fuzz-journald-audit/basic b/test/fuzz/fuzz-journald-audit/basic
|
|
|
4fbe94 |
new file mode 100644
|
|
|
4fbe94 |
index 0000000000..d1ce8cc5f0
|
|
|
4fbe94 |
--- /dev/null
|
|
|
4fbe94 |
+++ b/test/fuzz/fuzz-journald-audit/basic
|
|
|
4fbe94 |
@@ -0,0 +1 @@
|
|
|
4fbe94 |
+audit(1542398162.211:744): pid=7376 uid=1000 auid=1000 ses=6 subj=unconfined_u:unconfined_r:unconfined_t:s0-s0:c0.c1023 msg='op=PAM:accounting grantors=pam_unix,pam_localuser acct="vagrant" exe="/usr/bin/sudo" hostname=? addr=? terminal=/dev/pts/1 res=success'
|
|
|
4fbe94 |
\ No newline at end of file
|