From 0a203bd46a1e2ec8cc4b3626840e2ea9d0d13a9a Mon Sep 17 00:00:00 2001
From: Jan Rybar <jrybar@redhat.com>
Date: Wed, 16 Feb 2022 16:44:32 +0100
Subject: [PATCH] file descriptor exhaustion (GHSL-2021-077) Resolves:
 CVE-2021-4115

---
 CVE-2021-4115.patch | 71 +++++++++++++++++++++++++++++++++++++++++++++
 polkit.spec         |  7 ++++-
 2 files changed, 77 insertions(+), 1 deletion(-)
 create mode 100644 CVE-2021-4115.patch

diff --git a/CVE-2021-4115.patch b/CVE-2021-4115.patch
new file mode 100644
index 0000000..3cb5581
--- /dev/null
+++ b/CVE-2021-4115.patch
@@ -0,0 +1,71 @@
+diff --git a/src/polkit/polkitsystembusname.c b/src/polkit/polkitsystembusname.c
+index 8ed1363..2fbf5f1 100644
+--- a/src/polkit/polkitsystembusname.c
++++ b/src/polkit/polkitsystembusname.c
+@@ -62,6 +62,10 @@ enum
+   PROP_NAME,
+ };
+ 
++
++guint8 dbus_call_respond_fails;      // has to be global because of callback
++
++
+ static void subject_iface_init (PolkitSubjectIface *subject_iface);
+ 
+ G_DEFINE_TYPE_WITH_CODE (PolkitSystemBusName, polkit_system_bus_name, G_TYPE_OBJECT,
+@@ -364,6 +368,7 @@ on_retrieved_unix_uid_pid (GObject              *src,
+   if (!v)
+     {
+       data->caught_error = TRUE;
++      dbus_call_respond_fails += 1;
+     }
+   else
+     {
+@@ -405,6 +410,8 @@ polkit_system_bus_name_get_creds_sync (PolkitSystemBusName           *system_bus
+   tmp_context = g_main_context_new ();
+   g_main_context_push_thread_default (tmp_context);
+ 
++  dbus_call_respond_fails = 0;
++
+   /* Do two async calls as it's basically as fast as one sync call.
+    */
+   g_dbus_connection_call (connection,
+@@ -432,11 +439,34 @@ polkit_system_bus_name_get_creds_sync (PolkitSystemBusName           *system_bus
+ 			  on_retrieved_unix_uid_pid,
+ 			  &data);
+ 
+-  while (!((data.retrieved_uid && data.retrieved_pid) || data.caught_error))
+-    g_main_context_iteration (tmp_context, TRUE);
++  while (TRUE)
++  {
++    /* If one dbus call returns error, we must wait until the other call
++     * calls _call_finish(), otherwise fd leak is possible.
++     * Resolves: GHSL-2021-077
++    */
+ 
+-  if (data.caught_error)
+-    goto out;
++    if ( (dbus_call_respond_fails > 1) )
++    {
++      // we got two faults, we can leave
++      goto out;
++    }
++
++    if ((data.caught_error && (data.retrieved_pid || data.retrieved_uid)))
++    {
++      // we got one fault and the other call finally finished, we can leave
++      goto out;
++    }
++
++    if ( !(data.retrieved_uid && data.retrieved_pid) )
++    {
++      g_main_context_iteration (tmp_context, TRUE);
++    }
++    else
++    {
++      break;
++    }
++  }
+ 
+   if (out_uid)
+     *out_uid = data.uid;
diff --git a/polkit.spec b/polkit.spec
index 486916c..efad367 100644
--- a/polkit.spec
+++ b/polkit.spec
@@ -6,13 +6,14 @@
 Summary: An authorization framework
 Name: polkit
 Version: 0.120
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: LGPLv2+
 URL: http://www.freedesktop.org/wiki/Software/polkit
 Source0: http://www.freedesktop.org/software/polkit/releases/%{name}-%{version}.tar.gz
 Source1: http://www.freedesktop.org/software/polkit/releases/%{name}-%{version}.tar.gz.sign
 
 Patch1: a2bf5c9c83b6ae46cbd5c779d3055bff81ded683.patch
+Patch2: CVE-2021-4115.patch
 
 BuildRequires: gcc-c++
 BuildRequires: glib2-devel >= 2.30.0
@@ -176,6 +177,10 @@ exit 0
 %{_libdir}/girepository-1.0/*.typelib
 
 %changelog
+* Wed Feb 16 2022 Jan Rybar <jrybar@redhat.com> - 0.120-4
+- file descriptor exhaustion (GHSL-2021-077)
+- Resolves: CVE-2021-4115
+
 * Wed Jan 26 2022 Timothée Ravier <tim@siosm.fr> - 0.120-3
 - Fix for CVE-2021-4034