shaba/systemd-stable
1
1
Fork 0
mirror of https://github.com/systemd/systemd-stable.git synced 2024-12-22 13:33:56 +03:00
Code

fuzz-journal-remote: print some kinds of errors

Browse Source 
In https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=34803, we fail with:

  Assertion 'IN_SET(r, -ENOMEM, -EMFILE, -ENFILE)' failed at src/journal-remote/fuzz-journal-remote.c:69,
    function int LLVMFuzzerTestOneInput(const uint8_t *, size_t)(). Aborting.
  AddressSanitizer:DEADLYSIGNAL

Let's try to print the error, so maybe we can see what is going on.
With the previous commit we shouldn't print out anything.
This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2021-05-31 12:05:29 +02:00
parent 23b8aa648d
commit 2dd7a72d5a
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/journal-remote/fuzz-journal-remote.c
View File

@ -28,7 +28,7 @@ int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) {
return 0; return 0;
if (!getenv("SYSTEMD_LOG_LEVEL")) if (!getenv("SYSTEMD_LOG_LEVEL"))
log_set_max_level(LOG_CRIT); log_set_max_level(LOG_ERR);
fdin = memfd_new_and_map("fuzz-journal-remote", size, &mem); fdin = memfd_new_and_map("fuzz-journal-remote", size, &mem);
if (fdin < 0) if (fdin < 0)
@ -66,6 +66,7 @@ int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) {
r = sd_journal_open_files(&j, (const char**) STRV_MAKE(name), 0); r = sd_journal_open_files(&j, (const char**) STRV_MAKE(name), 0);
if (r < 0) { if (r < 0) {
log_error_errno(r, "sd_journal_open_files([\"%s\"]) failed: %m", name);
assert_se(IN_SET(r, -ENOMEM, -EMFILE, -ENFILE)); assert_se(IN_SET(r, -ENOMEM, -EMFILE, -ENFILE));
return r; return r;
} }