diff options
| author | Simon McVittie <smcv@collabora.com> | 2020-04-16 14:41:48 +0100 |
|---|---|---|
| committer | Simon McVittie <smcv@collabora.com> | 2020-06-02 10:43:39 +0100 |
| commit | 8bc1381819e5a845331650bfa28dacf6d2ac1748 (patch) | |
| tree | ccfb544d665d922dde0adbc04a727ed539d58343 | |
| parent | 272d484283883fa9ff95b69d924fff6cd34842f5 (diff) | |
| download | dbus-8bc1381819e5a845331650bfa28dacf6d2ac1748.tar.gz dbus-8bc1381819e5a845331650bfa28dacf6d2ac1748.tar.bz2 dbus-8bc1381819e5a845331650bfa28dacf6d2ac1748.zip | |
fdpass test: Assert that we don't leak file descriptors
This version is for the dbus-1.12 branch, and doesn't rely on dbus!153
or dbus!120.
Reproduces: dbus#294
Reproduces: CVE-2020-12049
Reproduces: GHSL-2020-057
Signed-off-by: Simon McVittie <smcv@collabora.com>
| -rw-r--r-- | test/fdpass.c | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/test/fdpass.c b/test/fdpass.c index 4a3edc4e..8bad675f 100644 --- a/test/fdpass.c +++ b/test/fdpass.c @@ -50,6 +50,14 @@ #include "test-utils-glib.h" +#ifdef DBUS_ENABLE_EMBEDDED_TESTS +#include <dbus/dbus-message-internal.h> +#else +typedef struct _DBusInitialFDs DBusInitialFDs; +#define _dbus_check_fdleaks_enter() NULL +#define _dbus_check_fdleaks_leave(fds) do {} while (0) +#endif + /* Arbitrary; included here to avoid relying on the default */ #define MAX_MESSAGE_UNIX_FDS 20 /* This test won't work on Linux unless this is true. */ @@ -92,6 +100,7 @@ typedef struct { GQueue messages; int fd_before; + DBusInitialFDs *initial_fds; } Fixture; static void oom (const gchar *doing) G_GNUC_NORETURN; @@ -176,6 +185,8 @@ test_connect (Fixture *f, if (f->skip) return; + f->initial_fds = _dbus_check_fdleaks_enter (); + g_assert (f->left_server_conn == NULL); g_assert (f->right_server_conn == NULL); @@ -871,6 +882,9 @@ teardown (Fixture *f, if (f->fd_before >= 0 && close (f->fd_before) < 0) g_error ("%s", g_strerror (errno)); #endif + + if (f->initial_fds != NULL) + _dbus_check_fdleaks_leave (f->initial_fds); } int |