56 lines
2.1 KiB
Diff
56 lines
2.1 KiB
Diff
From 19eadc77d4b941ae8918fca88a44ecd0876537ff Mon Sep 17 00:00:00 2001
|
|
From: Yu Watanabe <watanabe.yu+github@gmail.com>
|
|
Date: Sat, 28 Dec 2024 14:17:47 +0900
|
|
Subject: [PATCH] fuzz-journal-remote: use ASSERT_OK() and friends
|
|
|
|
(cherry picked from commit 27c992dd9fa7f69779adc85607523a1e52296af0)
|
|
|
|
Related: RHEL-79976
|
|
---
|
|
src/journal-remote/fuzz-journal-remote.c | 15 +++++----------
|
|
1 file changed, 5 insertions(+), 10 deletions(-)
|
|
|
|
diff --git a/src/journal-remote/fuzz-journal-remote.c b/src/journal-remote/fuzz-journal-remote.c
|
|
index 774389dee3..2427c739b8 100644
|
|
--- a/src/journal-remote/fuzz-journal-remote.c
|
|
+++ b/src/journal-remote/fuzz-journal-remote.c
|
|
@@ -16,6 +16,7 @@
|
|
#include "path-util.h"
|
|
#include "rm-rf.h"
|
|
#include "strv.h"
|
|
+#include "tests.h"
|
|
#include "tmpfile-util.h"
|
|
|
|
int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) {
|
|
@@ -54,14 +55,11 @@ int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) {
|
|
return r;
|
|
}
|
|
|
|
- r = journal_remote_add_source(&s, fdin, (char*) "fuzz-data", false);
|
|
- if (r < 0)
|
|
- return r;
|
|
+ ASSERT_OK_POSITIVE(journal_remote_add_source(&s, fdin, (char*) "fuzz-data", false));
|
|
TAKE_FD(fdin_close);
|
|
- assert(r > 0);
|
|
|
|
while (s.active)
|
|
- assert_se(journal_remote_handle_raw_source(NULL, fdin, 0, &s) >= 0);
|
|
+ ASSERT_OK(journal_remote_handle_raw_source(NULL, fdin, 0, &s));
|
|
|
|
assert_se(close(fdin) < 0 && errno == EBADF); /* Check that the fd is closed already */
|
|
|
|
@@ -84,11 +82,8 @@ int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) {
|
|
for (OutputMode mode = 0; mode < _OUTPUT_MODE_MAX; mode++) {
|
|
if (!dev_null)
|
|
log_info("/* %s */", output_mode_to_string(mode));
|
|
- r = show_journal(dev_null ?: stdout, j, mode, 0, 0, -1, 0, NULL);
|
|
- assert_se(r >= 0);
|
|
-
|
|
- r = sd_journal_seek_head(j);
|
|
- assert_se(r >= 0);
|
|
+ ASSERT_OK(show_journal(dev_null ?: stdout, j, mode, 0, 0, -1, 0, NULL));
|
|
+ ASSERT_OK(sd_journal_seek_head(j));
|
|
}
|
|
|
|
return 0;
|