Attachment #155025 for bug #198930

View | Details | Raw Unified | Return to bug 198930
Collapse All | Expand All

Lines 1-7 Link Here

(-)security/fprintd/Makefile (-1 / +1 lines)
1	# $FreeBSD$	1	# $FreeBSD$
2		2
3	PORTNAME= fprintd	3	PORTNAME= fprintd
4	PORTVERSION= 0.5.1	4	PORTVERSION= 0.6.0
5	CATEGORIES= security	5	CATEGORIES= security
6	MASTER_SITES= http://people.freedesktop.org/~hadess/	6	MASTER_SITES= http://people.freedesktop.org/~hadess/
7		7

Lines 1-2 Link Here

(-)security/fprintd/distinfo (-2 / +2 lines)
1	SHA256 (fprintd-0.5.1.tar.xz) = 9256970fe30cb0332c1932fc0dad3c8d83570eb8e153305e9430e3cd90806e58	1	SHA256 (fprintd-0.6.0.tar.xz) = 3f5462eeb4917d2f74925b904ceb2668c011b732d84fb1c5679f4f9ce9b6c6af
2	SIZE (fprintd-0.5.1.tar.xz) = 285336	2	SIZE (fprintd-0.6.0.tar.xz) = 287964

Lines 1-8 Link Here

(-)security/fprintd/files/patch-data__fprintd.pod (-8 lines)
1	--- ./data/fprintd.pod.orig 2014-09-20 01:55:30.860796233 +0400
2	+++ ./data/fprintd.pod 2014-09-20 01:55:49.300794976 +0400
3	@@ -100,3 +100,5 @@
4	=over 8
5
6	=item B<dbus-daemon>, B<gnome-about-me>
7	+
8	+=back




From 7e4630ced2be4b7ecdfb9d60cfe0e0d3de594411 Mon Sep 17 00:00:00 2001
From: Bastien Nocera <hadess@hadess.net>
Date: Mon, 27 Jan 2014 12:24:14 +0100
Subject: pam: Fix eventfd leak

When we create our own GMainContext, we need to be the ones
disposing of it as well, as GMainLoop won't take ownership of it.

From https://bugzilla.redhat.com/show_bug.cgi?id=1050827

diff --git a/pam/pam_fprintd.c b/pam/pam_fprintd.c
index 0f5e5a4..07302a1 100644
--- pam/pam_fprintd.c
+++ pam/pam_fprintd.c
@@ -170,6 +170,17 @@ static void close_and_unref (DBusGConnection *connection)
 	dbus_g_connection_unref (connection);
 }
 
+static void unref_loop (GMainLoop *loop)
+{
+	GMainContext *ctx;
+
+	/* The main context was created separately, so
+	 * we'll need to unref it ourselves */
+	ctx = g_main_loop_get_context (loop);
+	g_main_loop_unref (loop);
+	g_main_context_unref (ctx);
+}
+
 #define DBUS_TYPE_G_OBJECT_PATH_ARRAY (dbus_g_type_get_collection ("GPtrArray", DBUS_TYPE_G_OBJECT_PATH))
 
 static DBusGProxy *open_device(pam_handle_t *pamh, DBusGConnection *connection, DBusGProxy *manager, const char *username, gboolean *has_multiple_devices)
@@ -397,13 +408,13 @@ static int do_auth(pam_handle_t *pamh, const char *username)
 	dev = open_device(pamh, connection, manager, username, &has_multiple_devices);
 	g_object_unref (manager);
 	if (!dev) {
-		g_main_loop_unref (loop);
+		unref_loop (loop);
 		close_and_unref (connection);
 		return PAM_AUTHINFO_UNAVAIL;
 	}
 	ret = do_verify(loop, pamh, dev, has_multiple_devices);
 
-	g_main_loop_unref (loop);
+	unref_loop (loop);
 	release_device(pamh, dev);
 	g_object_unref (dev);
 	close_and_unref (connection);
-- 
cgit v0.10.2


Lines 2-9 Link Here

(-)security/libfprint/Makefile (-2 / +1 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= libfprint	4	PORTNAME= libfprint
5	PORTVERSION= 0.5.1	5	PORTVERSION= 0.6.0
6	PORTREVISION= 1
7	CATEGORIES= security	6	CATEGORIES= security
8	MASTER_SITES= http://people.freedesktop.org/~hadess/	7	MASTER_SITES= http://people.freedesktop.org/~hadess/
9		8

Lines 1-2 Link Here

(-)security/libfprint/distinfo (-2 / +2 lines)
1	SHA256 (libfprint-0.5.1.tar.xz) = 6d12563b91888b84b71eee6d2e113d8e9e9940c6a28a0915656b6f86b9568fb3	1	SHA256 (libfprint-0.6.0.tar.xz) = 2583fcb7d542a918c023776f188067fcedec614e65494dd52bc4d661be803cbe
2	SIZE (libfprint-0.5.1.tar.xz) = 494020	2	SIZE (libfprint-0.6.0.tar.xz) = 531572

Return to bug 198930

Lines 1-51 Link Here

(-)security/fprintd/files/patch-pam-pam_fprintd.c (-51 lines)
1	From 7e4630ced2be4b7ecdfb9d60cfe0e0d3de594411 Mon Sep 17 00:00:00 2001
2	From: Bastien Nocera <hadess@hadess.net>
3	Date: Mon, 27 Jan 2014 12:24:14 +0100
4	Subject: pam: Fix eventfd leak
5
6	When we create our own GMainContext, we need to be the ones
7	disposing of it as well, as GMainLoop won't take ownership of it.
8
9	From https://bugzilla.redhat.com/show_bug.cgi?id=1050827
10
11	diff --git a/pam/pam_fprintd.c b/pam/pam_fprintd.c
12	index 0f5e5a4..07302a1 100644
13	--- pam/pam_fprintd.c
14	+++ pam/pam_fprintd.c
15	@@ -170,6 +170,17 @@ static void close_and_unref (DBusGConnection *connection)
16	dbus_g_connection_unref (connection);
17	}
18
19	+static void unref_loop (GMainLoop *loop)
20	+{
21	+ GMainContext *ctx;
22	+
23	+ /* The main context was created separately, so
24	+ * we'll need to unref it ourselves */
25	+ ctx = g_main_loop_get_context (loop);
26	+ g_main_loop_unref (loop);
27	+ g_main_context_unref (ctx);
28	+}
29	+
30	#define DBUS_TYPE_G_OBJECT_PATH_ARRAY (dbus_g_type_get_collection ("GPtrArray", DBUS_TYPE_G_OBJECT_PATH))
31
32	static DBusGProxy open_device(pam_handle_t pamh, DBusGConnection connection, DBusGProxy manager, const char username, gboolean has_multiple_devices)
33	@@ -397,13 +408,13 @@ static int do_auth(pam_handle_t pamh, const char username)
34	dev = open_device(pamh, connection, manager, username, &has_multiple_devices);
35	g_object_unref (manager);
36	if (!dev) {
37	- g_main_loop_unref (loop);
38	+ unref_loop (loop);
39	close_and_unref (connection);
40	return PAM_AUTHINFO_UNAVAIL;
41	}
42	ret = do_verify(loop, pamh, dev, has_multiple_devices);
43
44	- g_main_loop_unref (loop);
45	+ unref_loop (loop);
46	release_device(pamh, dev);
47	g_object_unref (dev);
48	close_and_unref (connection);
49	--
50	cgit v0.10.2
51