shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2025-01-26 14:04:03 +03:00
Code

fuzz-journal-remote: fix potential fd-leak

Browse Source
This commit is contained in:
Yu Watanabe 2023-03-18 20:29:27 +09:00
parent 7b60f72cdd
commit 9b72eacad2
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -19,14 +19,13 @@
#include "tmpfile-util.h"
int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) {
int fdin;
void *mem;
_cleanup_close_ int fdout = -EBADF;
_cleanup_close_ int fdin_close = -EBADF, fdout = -EBADF;
_cleanup_(rm_rf_physical_and_freep) char *tmp = NULL;
_cleanup_(unlink_and_freep) char *name = NULL;
_cleanup_(sd_journal_closep) sd_journal *j = NULL;
_cleanup_(journal_remote_server_destroy) RemoteServer s = {};
int r;
void *mem;
int fdin, r;
if (outside_size_range(size, 3, 65536))
return 0;
@ -37,7 +36,7 @@ int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) {
assert_se(mkdtemp_malloc("/tmp/fuzz-journal-remote-XXXXXX", &tmp) >= 0);
assert_se(name = path_join(tmp, "fuzz-journal-remote.XXXXXX.journal"));
fdin = memfd_new_and_map("fuzz-journal-remote", size, &mem);
fdin = fdin_close = memfd_new_and_map("fuzz-journal-remote", size, &mem);
if (fdin < 0)
return log_error_errno(fdin, "memfd_new_and_map() failed: %m");
@ -57,10 +56,9 @@ int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) {
}
r = journal_remote_add_source(&s, fdin, (char*) "fuzz-data", false);
if (r < 0) {
safe_close(fdin);
if (r < 0)
return r;
}
TAKE_FD(fdin_close);
assert(r > 0);
while (s.active)