1
0
mirror of https://github.com/systemd/systemd.git synced 2024-10-29 21:55:36 +03:00

Merge pull request #22605 from yuwata/test-journal-send-fd-leaks

test-journal-send: fix fd leaks
This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2022-02-23 09:15:41 +01:00 committed by GitHub
commit 0b6c0b8083
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 40 additions and 2 deletions

View File

@ -12,6 +12,7 @@ sd_journal_sources = files(
'sd-journal/journal-file.h',
'sd-journal/journal-internal.h',
'sd-journal/journal-send.c',
'sd-journal/journal-send.h',
'sd-journal/journal-vacuum.c',
'sd-journal/journal-vacuum.h',
'sd-journal/journal-verify.c',

View File

@ -6,6 +6,9 @@
#include <stddef.h>
#include <sys/un.h>
#include <unistd.h>
#if HAVE_VALGRIND_VALGRIND_H
#include <valgrind/valgrind.h>
#endif
#define SD_JOURNAL_SUPPRESS_LOCATION
@ -14,8 +17,9 @@
#include "alloc-util.h"
#include "errno-util.h"
#include "fd-util.h"
#include "io-util.h"
#include "fileio.h"
#include "io-util.h"
#include "journal-send.h"
#include "memfd-util.h"
#include "socket-util.h"
#include "stdio-util.h"
@ -39,10 +43,10 @@
* all its threads, and all its subprocesses. This means we need to
* initialize it atomically, and need to operate on it atomically
* never assuming we are the only user */
static int fd_plus_one = 0;
static int journal_fd(void) {
int fd;
static int fd_plus_one = 0;
retry:
if (fd_plus_one > 0)
@ -62,6 +66,24 @@ retry:
return fd;
}
#if VALGRIND
void close_journal_fd(void) {
/* Be nice to valgrind. This is not atomic. This must be used only in tests. */
if (!RUNNING_ON_VALGRIND)
return;
if (getpid() != gettid())
return;
if (fd_plus_one <= 0)
return;
safe_close(fd_plus_one - 1);
fd_plus_one = 0;
}
#endif
_public_ int sd_journal_print(int priority, const char *format, ...) {
int r;
va_list ap;

View File

@ -0,0 +1,8 @@
/* SPDX-License-Identifier: LGPL-2.1-or-later */
#pragma once
#if VALGRIND
void close_journal_fd(void);
#else
static inline void close_journal_fd(void) {}
#endif

View File

@ -5,7 +5,9 @@
#include <unistd.h>
#include "sd-journal.h"
#include "fileio.h"
#include "journal-send.h"
#include "macro.h"
#include "memory-util.h"
@ -90,6 +92,10 @@ static void test_journal_send(void) {
assert_se(sd_journal_sendv(graph2, 1) == 0);
assert_se(sd_journal_sendv(message1, 1) == 0);
assert_se(sd_journal_sendv(message2, 1) == 0);
/* The above syslog() opens a fd which is stored in libc, and the valgrind reports the fd is
* leaked when we do not call closelog(). */
closelog();
}
int main(int argc, char *argv[]) {
@ -99,5 +105,6 @@ int main(int argc, char *argv[]) {
/* Sleep a bit to make it easy for journald to collect metadata. */
sleep(1);
close_journal_fd();
return 0;
}