Compare commits
5 Commits
Author | SHA1 | Date | |
---|---|---|---|
|
175b229b50 | ||
|
df01f6f285 | ||
|
ebcac033f0 | ||
|
b0dfcef370 | ||
|
b966034b58 |
49
0001-PolkitAgentSession-Don-t-leak-file-descriptors.patch
Normal file
49
0001-PolkitAgentSession-Don-t-leak-file-descriptors.patch
Normal file
@ -0,0 +1,49 @@
|
|||||||
|
From 4aa6dd28476e12a5265d71b6bc19c730f1036785 Mon Sep 17 00:00:00 2001
|
||||||
|
From: David Zeuthen <davidz@redhat.com>
|
||||||
|
Date: Thu, 8 Mar 2012 15:36:30 -0500
|
||||||
|
Subject: [PATCH] PolkitAgentSession: Don't leak file descriptors
|
||||||
|
|
||||||
|
This was reported here
|
||||||
|
|
||||||
|
https://bugzilla.gnome.org/show_bug.cgi?id=671486
|
||||||
|
|
||||||
|
Signed-off-by: David Zeuthen <davidz@redhat.com>
|
||||||
|
---
|
||||||
|
src/polkitagent/polkitagentsession.c | 14 ++++++++++++++
|
||||||
|
1 files changed, 14 insertions(+), 0 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/src/polkitagent/polkitagentsession.c b/src/polkitagent/polkitagentsession.c
|
||||||
|
index ad3bbc3..8129cd9 100644
|
||||||
|
--- a/src/polkitagent/polkitagentsession.c
|
||||||
|
+++ b/src/polkitagent/polkitagentsession.c
|
||||||
|
@@ -130,6 +130,8 @@ G_DEFINE_TYPE (PolkitAgentSession, polkit_agent_session, G_TYPE_OBJECT);
|
||||||
|
static void
|
||||||
|
polkit_agent_session_init (PolkitAgentSession *session)
|
||||||
|
{
|
||||||
|
+ session->child_stdin = -1;
|
||||||
|
+ session->child_stdout = -1;
|
||||||
|
}
|
||||||
|
|
||||||
|
static void kill_helper (PolkitAgentSession *session);
|
||||||
|
@@ -395,6 +397,18 @@ kill_helper (PolkitAgentSession *session)
|
||||||
|
session->child_stdout_channel = NULL;
|
||||||
|
}
|
||||||
|
|
||||||
|
+ if (session->child_stdout != -1)
|
||||||
|
+ {
|
||||||
|
+ g_warn_if_fail (close (session->child_stdout) == 0);
|
||||||
|
+ session->child_stdout = -1;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ if (session->child_stdin != -1)
|
||||||
|
+ {
|
||||||
|
+ g_warn_if_fail (close (session->child_stdin) == 0);
|
||||||
|
+ session->child_stdin = -1;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
session->helper_is_running = FALSE;
|
||||||
|
|
||||||
|
out:
|
||||||
|
--
|
||||||
|
1.7.9.1
|
||||||
|
|
115
polkit-0.112-gobject-interface-type-registration-race.patch
Normal file
115
polkit-0.112-gobject-interface-type-registration-race.patch
Normal file
@ -0,0 +1,115 @@
|
|||||||
|
From 20ad116a6582e57d20f9d8197758947918753a4c Mon Sep 17 00:00:00 2001
|
||||||
|
From: Tomas Bzatek <tbzatek@redhat.com>
|
||||||
|
Date: Wed, 29 May 2013 13:45:31 +0000
|
||||||
|
Subject: Use GOnce for interface type registration
|
||||||
|
|
||||||
|
Static local variable may not be enough since it doesn't provide locking.
|
||||||
|
|
||||||
|
Related to these udisksd warnings:
|
||||||
|
GLib-GObject-WARNING **: cannot register existing type `PolkitSubject'
|
||||||
|
|
||||||
|
Thanks to Hans de Goede for spotting this!
|
||||||
|
|
||||||
|
https://bugs.freedesktop.org/show_bug.cgi?id=65130
|
||||||
|
---
|
||||||
|
diff --git a/src/polkit/polkitidentity.c b/src/polkit/polkitidentity.c
|
||||||
|
index dd15b2f..7813c2c 100644
|
||||||
|
--- a/src/polkit/polkitidentity.c
|
||||||
|
+++ b/src/polkit/polkitidentity.c
|
||||||
|
@@ -49,9 +49,9 @@ base_init (gpointer g_iface)
|
||||||
|
GType
|
||||||
|
polkit_identity_get_type (void)
|
||||||
|
{
|
||||||
|
- static GType iface_type = 0;
|
||||||
|
+ static volatile gsize g_define_type_id__volatile = 0;
|
||||||
|
|
||||||
|
- if (iface_type == 0)
|
||||||
|
+ if (g_once_init_enter (&g_define_type_id__volatile))
|
||||||
|
{
|
||||||
|
static const GTypeInfo info =
|
||||||
|
{
|
||||||
|
@@ -67,12 +67,14 @@ polkit_identity_get_type (void)
|
||||||
|
NULL /* value_table */
|
||||||
|
};
|
||||||
|
|
||||||
|
- iface_type = g_type_register_static (G_TYPE_INTERFACE, "PolkitIdentity", &info, 0);
|
||||||
|
+ GType iface_type =
|
||||||
|
+ g_type_register_static (G_TYPE_INTERFACE, "PolkitIdentity", &info, 0);
|
||||||
|
|
||||||
|
g_type_interface_add_prerequisite (iface_type, G_TYPE_OBJECT);
|
||||||
|
+ g_once_init_leave (&g_define_type_id__volatile, iface_type);
|
||||||
|
}
|
||||||
|
|
||||||
|
- return iface_type;
|
||||||
|
+ return g_define_type_id__volatile;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
diff --git a/src/polkit/polkitsubject.c b/src/polkit/polkitsubject.c
|
||||||
|
index d2c4c20..aed5795 100644
|
||||||
|
--- a/src/polkit/polkitsubject.c
|
||||||
|
+++ b/src/polkit/polkitsubject.c
|
||||||
|
@@ -50,9 +50,9 @@ base_init (gpointer g_iface)
|
||||||
|
GType
|
||||||
|
polkit_subject_get_type (void)
|
||||||
|
{
|
||||||
|
- static GType iface_type = 0;
|
||||||
|
+ static volatile gsize g_define_type_id__volatile = 0;
|
||||||
|
|
||||||
|
- if (iface_type == 0)
|
||||||
|
+ if (g_once_init_enter (&g_define_type_id__volatile))
|
||||||
|
{
|
||||||
|
static const GTypeInfo info =
|
||||||
|
{
|
||||||
|
@@ -68,12 +68,14 @@ polkit_subject_get_type (void)
|
||||||
|
NULL /* value_table */
|
||||||
|
};
|
||||||
|
|
||||||
|
- iface_type = g_type_register_static (G_TYPE_INTERFACE, "PolkitSubject", &info, 0);
|
||||||
|
+ GType iface_type =
|
||||||
|
+ g_type_register_static (G_TYPE_INTERFACE, "PolkitSubject", &info, 0);
|
||||||
|
|
||||||
|
g_type_interface_add_prerequisite (iface_type, G_TYPE_OBJECT);
|
||||||
|
+ g_once_init_leave (&g_define_type_id__volatile, iface_type);
|
||||||
|
}
|
||||||
|
|
||||||
|
- return iface_type;
|
||||||
|
+ return g_define_type_id__volatile;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
diff --git a/src/polkitbackend/polkitbackendactionlookup.c b/src/polkitbackend/polkitbackendactionlookup.c
|
||||||
|
index 5a1a228..20747e7 100644
|
||||||
|
--- a/src/polkitbackend/polkitbackendactionlookup.c
|
||||||
|
+++ b/src/polkitbackend/polkitbackendactionlookup.c
|
||||||
|
@@ -74,9 +74,9 @@ base_init (gpointer g_iface)
|
||||||
|
GType
|
||||||
|
polkit_backend_action_lookup_get_type (void)
|
||||||
|
{
|
||||||
|
- static GType iface_type = 0;
|
||||||
|
+ static volatile gsize g_define_type_id__volatile = 0;
|
||||||
|
|
||||||
|
- if (iface_type == 0)
|
||||||
|
+ if (g_once_init_enter (&g_define_type_id__volatile))
|
||||||
|
{
|
||||||
|
static const GTypeInfo info =
|
||||||
|
{
|
||||||
|
@@ -92,12 +92,14 @@ polkit_backend_action_lookup_get_type (void)
|
||||||
|
NULL /* value_table */
|
||||||
|
};
|
||||||
|
|
||||||
|
- iface_type = g_type_register_static (G_TYPE_INTERFACE, "PolkitBackendActionLookup", &info, 0);
|
||||||
|
+ GType iface_type =
|
||||||
|
+ g_type_register_static (G_TYPE_INTERFACE, "PolkitBackendActionLookup", &info, 0);
|
||||||
|
|
||||||
|
g_type_interface_add_prerequisite (iface_type, G_TYPE_OBJECT);
|
||||||
|
+ g_once_init_leave (&g_define_type_id__volatile, iface_type);
|
||||||
|
}
|
||||||
|
|
||||||
|
- return iface_type;
|
||||||
|
+ return g_define_type_id__volatile;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
--
|
||||||
|
cgit v0.9.0.2-2-gbebe
|
19
polkit.spec
19
polkit.spec
@ -1,7 +1,7 @@
|
|||||||
Summary: PolicyKit Authorization Framework
|
Summary: PolicyKit Authorization Framework
|
||||||
Name: polkit
|
Name: polkit
|
||||||
Version: 0.104
|
Version: 0.104
|
||||||
Release: 4%{?dist}
|
Release: 7%{?dist}
|
||||||
License: LGPLv2+
|
License: LGPLv2+
|
||||||
URL: http://www.freedesktop.org/wiki/Software/PolicyKit
|
URL: http://www.freedesktop.org/wiki/Software/PolicyKit
|
||||||
Source0: http://hal.freedesktop.org/releases/%{name}-%{version}.tar.gz
|
Source0: http://hal.freedesktop.org/releases/%{name}-%{version}.tar.gz
|
||||||
@ -28,6 +28,11 @@ Provides: polkit-desktop-policy = 0.103
|
|||||||
|
|
||||||
Patch0: 0001-PolkitUnixSession-Set-error-if-we-cannot-find-a-sess.patch
|
Patch0: 0001-PolkitUnixSession-Set-error-if-we-cannot-find-a-sess.patch
|
||||||
Patch1: 0002-PolkitUnixSession-Actually-return-TRUE-if-a-session-.patch
|
Patch1: 0002-PolkitUnixSession-Actually-return-TRUE-if-a-session-.patch
|
||||||
|
Patch2: 0001-PolkitAgentSession-Don-t-leak-file-descriptors.patch
|
||||||
|
|
||||||
|
# https://bugzilla.redhat.com/show_bug.cgi?id=853316
|
||||||
|
# Use GOnce for interface type registration
|
||||||
|
Patch3: polkit-0.112-gobject-interface-type-registration-race.patch
|
||||||
|
|
||||||
%description
|
%description
|
||||||
PolicyKit is a toolkit for defining and handling authorizations.
|
PolicyKit is a toolkit for defining and handling authorizations.
|
||||||
@ -52,6 +57,7 @@ Group: Development/Libraries
|
|||||||
Requires: %name-devel = %{version}-%{release}
|
Requires: %name-devel = %{version}-%{release}
|
||||||
Obsoletes: PolicyKit-docs <= 0.10
|
Obsoletes: PolicyKit-docs <= 0.10
|
||||||
Provides: PolicyKit-docs = 0.11
|
Provides: PolicyKit-docs = 0.11
|
||||||
|
BuildArch: noarch
|
||||||
|
|
||||||
%description docs
|
%description docs
|
||||||
Development documentation for PolicyKit.
|
Development documentation for PolicyKit.
|
||||||
@ -60,6 +66,8 @@ Development documentation for PolicyKit.
|
|||||||
%setup -q
|
%setup -q
|
||||||
%patch0 -p1
|
%patch0 -p1
|
||||||
%patch1 -p1
|
%patch1 -p1
|
||||||
|
%patch2 -p1
|
||||||
|
%patch3 -p1 -b .gtype-race
|
||||||
|
|
||||||
%build
|
%build
|
||||||
%configure --enable-gtk-doc \
|
%configure --enable-gtk-doc \
|
||||||
@ -130,6 +138,15 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/polkit-1/extensions/*.la
|
|||||||
%{_datadir}/gtk-doc
|
%{_datadir}/gtk-doc
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Wed May 29 2013 Tomas Bzatek <tbzatek@redhat.com> 0.104-7%{?dist}
|
||||||
|
- Fix a race on PolkitSubject type registration (#853316)
|
||||||
|
|
||||||
|
* Thu Mar 08 2012 David Zeuthen <davidz@redhat.com> 0.104-6%{?dist}
|
||||||
|
- Don't leak file descriptors (bgo #671486)
|
||||||
|
|
||||||
|
* Mon Feb 13 2012 Matthias Clasen <mclasen@redhat.com> - 0.104-5%{?dist}
|
||||||
|
- Make the -docs subpackage noarch
|
||||||
|
|
||||||
* Mon Feb 06 2012 David Zeuthen <davidz@redhat.com> 0.104-4%{?dist}
|
* Mon Feb 06 2012 David Zeuthen <davidz@redhat.com> 0.104-4%{?dist}
|
||||||
- Set error if we cannot obtain a PolkitUnixSession for a given PID (#787222)
|
- Set error if we cannot obtain a PolkitUnixSession for a given PID (#787222)
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user