60 lines
1.6 KiB
Diff
60 lines
1.6 KiB
Diff
commit 8bc1381819e5a845331650bfa28dacf6d2ac1748
|
|
Author: Simon McVittie <smcv@collabora.com>
|
|
Date: Thu Apr 16 14:41:48 2020 +0100
|
|
|
|
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>
|
|
|
|
Index: dbus-1.12.2/test/fdpass.c
|
|
===================================================================
|
|
--- dbus-1.12.2.orig/test/fdpass.c
|
|
+++ dbus-1.12.2/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. */
|
|
@@ -91,6 +99,7 @@ typedef struct {
|
|
GQueue messages;
|
|
|
|
int fd_before;
|
|
+ DBusInitialFDs *initial_fds;
|
|
} Fixture;
|
|
|
|
static void oom (const gchar *doing) G_GNUC_NORETURN;
|
|
@@ -172,6 +181,8 @@ test_connect (Fixture *f,
|
|
{
|
|
char *address;
|
|
|
|
+ f->initial_fds = _dbus_check_fdleaks_enter ();
|
|
+
|
|
g_assert (f->left_server_conn == NULL);
|
|
g_assert (f->right_server_conn == NULL);
|
|
|
|
@@ -837,6 +848,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
|