[polkit/f18] Fix a race on PolkitSubject type registration (#866718)
Tomas Bzatek
tbzatek at fedoraproject.org
Wed May 29 14:33:33 UTC 2013
commit 5f3df8c3fd3957e6d16a697446113a19ee739c57
Author: Tomas Bzatek <tbzatek at redhat.com>
Date: Wed May 29 16:33:15 2013 +0200
Fix a race on PolkitSubject type registration (#866718)
...-gobject-interface-type-registration-race.patch | 115 ++++++++++++++++++++
polkit.spec | 10 ++-
2 files changed, 124 insertions(+), 1 deletions(-)
---
diff --git a/polkit-0.112-gobject-interface-type-registration-race.patch b/polkit-0.112-gobject-interface-type-registration-race.patch
new file mode 100644
index 0000000..0e28118
--- /dev/null
+++ b/polkit-0.112-gobject-interface-type-registration-race.patch
@@ -0,0 +1,115 @@
+From 20ad116a6582e57d20f9d8197758947918753a4c Mon Sep 17 00:00:00 2001
+From: Tomas Bzatek <tbzatek at 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
diff --git a/polkit.spec b/polkit.spec
index e811e84..e951b89 100644
--- a/polkit.spec
+++ b/polkit.spec
@@ -1,7 +1,7 @@
Summary: polkit Authorization Framework
Name: polkit
Version: 0.107
-Release: 4%{?dist}
+Release: 5%{?dist}
License: LGPLv2+
URL: http://www.freedesktop.org/wiki/Software/polkit
Source0: http://www.freedesktop.org/software/polkit/releases/%{name}-%{version}.tar.gz
@@ -32,6 +32,10 @@ Provides: polkit-desktop-policy = 0.103
Patch0: polkit-0.107-fall-back-to-uid0-if-no-admin-users-are-available.patch
Patch1: polkit-0.107-avoid-crashing-if-initializing-the-server-object-fails.patch
+# https://bugzilla.redhat.com/show_bug.cgi?id=866718
+# Use GOnce for interface type registration
+Patch2: polkit-0.112-gobject-interface-type-registration-race.patch
+
%description
polkit is a toolkit for defining and handling authorizations. It is
used for allowing unprivileged processes to speak to privileged
@@ -64,6 +68,7 @@ Development documentation for polkit.
%setup -q
%patch0 -p1 -b .fall-back-to-uid-0
%patch1 -p1 -b .crash-fix
+%patch2 -p1 -b .gtype-race
%build
%configure --enable-gtk-doc \
@@ -132,6 +137,9 @@ exit 0
%{_datadir}/gtk-doc
%changelog
+* Wed May 29 2013 Tomas Bzatek <tbzatek at redhat.com> 0.107-5
+- Fix a race on PolkitSubject type registration (#866718)
+
* Wed Oct 10 2012 Adam Jackson <ajax at redhat.com> 0.107-4
- Don't crash if initializing the server object fails
More information about the scm-commits
mailing list