[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

upload policykit-1



Hello.


I've prepared security update for policykit. Debdiff is attached. The
fix backported from unstable[1] which uses same branch of policykit as
old stable. For the testing part, It already has two tests and I've
installed new build on clean jessie machine and running couple of its
rdepends. Please review and upload.


Thanks in advance.
--abhijith

[1] -
https://salsa.debian.org/utopia-team/polkit/raw/debian/0.105-21/debian/patches/0.115/Fix-CVE-2018-1116-Trusting-client-supplied-UID.patch
diff -Nru policykit-1-0.105/debian/changelog policykit-1-0.105/debian/changelog
--- policykit-1-0.105/debian/changelog	2016-09-06 17:53:11.000000000 +0200
+++ policykit-1-0.105/debian/changelog	2018-07-27 15:30:41.000000000 +0200
@@ -1,3 +1,14 @@
+policykit-1 (0.105-15~deb8u3) jessie-security; urgency=high
+
+  * Non-maintainer upload by the Debian LTS Team.
+  * Fix CVE-2018-1116: polkit_backend_interactive_authority_check_authorization
+    function in polkitd allows to test for authentication and trigger
+    authentication of unrelated processes owned by other users which result
+    in local DoS.
+  * d/libpolkit-gobject-1-0.symbols: Update for new ABI
+
+ -- Abhijith PA <abhijith@disroot.org>  Fri, 27 Jul 2018 19:00:41 +0530
+
 policykit-1 (0.105-15~deb8u2) stable; urgency=medium
 
   * Disable 0.113/sessionmonitor-systemd-prepare-for-D-Bus-user-bus-mo.patch
diff -Nru policykit-1-0.105/debian/libpolkit-gobject-1-0.symbols policykit-1-0.105/debian/libpolkit-gobject-1-0.symbols
--- policykit-1-0.105/debian/libpolkit-gobject-1-0.symbols	2016-09-06 17:53:11.000000000 +0200
+++ policykit-1-0.105/debian/libpolkit-gobject-1-0.symbols	2018-07-27 15:30:41.000000000 +0200
@@ -123,6 +123,7 @@
  polkit_unix_netgroup_set_name@Base 0.104
  polkit_unix_process_get_owner@Base 0.94
  polkit_unix_process_get_pid@Base 0.94
+ polkit_unix_process_get_racy_uid__@Base 0.105-15~
  polkit_unix_process_get_start_time@Base 0.94
  polkit_unix_process_get_type@Base 0.94
  polkit_unix_process_get_uid@Base 0.101
diff -Nru policykit-1-0.105/debian/patches/CVE-2018-1116.patch policykit-1-0.105/debian/patches/CVE-2018-1116.patch
--- policykit-1-0.105/debian/patches/CVE-2018-1116.patch	1970-01-01 01:00:00.000000000 +0100
+++ policykit-1-0.105/debian/patches/CVE-2018-1116.patch	2018-07-27 15:30:41.000000000 +0200
@@ -0,0 +1,525 @@
+Description: Fix CVE-2018-1116
+ The implementation of the polkit_backend_interactive_authority_check_authorization
+ function in polkitd allows to test for authentication and trigger authentication
+ of unrelated processes owned by other users. This may result in a local DoS and
+ information disclosure.
+
+Author: Abhijith PA <abhijith@disroot.org>
+Bug-Debian: https://bugs.debian.org/903563
+Origin: https://salsa.debian.org/utopia-team/polkit/blob/debian/0.105-21/debian/patches/0.115/Fix-CVE-2018-1116-Trusting-client-supplied-UID.patch
+Last-Update: 2018-07-27
+
+diff --git a/src/polkit/polkitprivate.h b/src/polkit/polkitprivate.h
+index 579cc25..d6cd45d 100644
+--- a/src/polkit/polkitprivate.h
++++ b/src/polkit/polkitprivate.h
+@@ -34,6 +34,8 @@ GVariant *polkit_action_description_to_gvariant (PolkitActionDescription *action
+ GVariant *polkit_subject_to_gvariant (PolkitSubject *subject);
+ GVariant *polkit_identity_to_gvariant (PolkitIdentity *identity);
+ 
++gint polkit_unix_process_get_racy_uid__ (PolkitUnixProcess *process, GError **error);
++
+ PolkitSubject  *polkit_subject_new_for_gvariant (GVariant *variant, GError **error);
+ PolkitIdentity *polkit_identity_new_for_gvariant (GVariant *variant, GError **error);
+ 
+diff --git a/src/polkit/polkitunixprocess.c b/src/polkit/polkitunixprocess.c
+index 913be3a..464f034 100644
+--- a/src/polkit/polkitunixprocess.c
++++ b/src/polkit/polkitunixprocess.c
+@@ -49,6 +49,14 @@
+  * To uniquely identify processes, both the process id and the start
+  * time of the process (a monotonic increasing value representing the
+  * time since the kernel was started) is used.
++ *
++ * NOTE: This object stores, and provides access to, the real UID of the
++ * process.  That value can change over time (with set*uid*(2) and exec*(2)).
++ * Checks whether an operation is allowed need to take care to use the UID
++ * value as of the time when the operation was made (or, following the open()
++ * privilege check model, when the connection making the operation possible
++ * was initiated).  That is usually done by initializing this with
++ * polkit_unix_process_new_for_owner() with trusted data.
+  */
+ 
+ /**
+@@ -83,9 +91,6 @@ static void subject_iface_init (PolkitSubjectIface *subject_iface);
+ static guint64 get_start_time_for_pid (gint    pid,
+                                        GError **error);
+ 
+-static gint _polkit_unix_process_get_owner (PolkitUnixProcess  *process,
+-                                            GError            **error);
+-
+ #ifdef HAVE_FREEBSD
+ static gboolean get_kinfo_proc (gint pid, struct kinfo_proc *p);
+ #endif
+@@ -170,7 +175,7 @@ polkit_unix_process_constructed (GObject *object)
+     {
+       GError *error;
+       error = NULL;
+-      process->uid = _polkit_unix_process_get_owner (process, &error);
++      process->uid = polkit_unix_process_get_racy_uid__ (process, &error);
+       if (error != NULL)
+         {
+           process->uid = -1;
+@@ -259,6 +264,12 @@ polkit_unix_process_class_init (PolkitUnixProcessClass *klass)
+  * Gets the user id for @process. Note that this is the real user-id,
+  * not the effective user-id.
+  *
++ * NOTE: The UID may change over time, so the returned value may not match the
++ * current state of the underlying process; or the UID may have been set by
++ * polkit_unix_process_new_for_owner() or polkit_unix_process_set_uid(),
++ * in which case it may not correspond to the actual UID of the referenced
++ * process at all (at any point in time).
++ *
+  * Returns: The user id for @process or -1 if unknown.
+  */
+ gint
+@@ -655,18 +666,26 @@ out:
+   return start_time;
+ }
+ 
+-static gint
+-_polkit_unix_process_get_owner (PolkitUnixProcess  *process,
+-                                GError            **error)
++/*
++ * Private: Return the "current" UID.  Note that this is inherently racy,
++ * and the value may already be obsolete by the time this function returns;
++ * this function only guarantees that the UID was valid at some point during
++ * its execution.
++ */
++gint
++polkit_unix_process_get_racy_uid__ (PolkitUnixProcess  *process,
++                                    GError            **error)
+ {
+   gint result;
+   gchar *contents;
+   gchar **lines;
++  guint64 start_time;
+ #ifdef HAVE_FREEBSD
+   struct kinfo_proc p;
+ #else
+   gchar filename[64];
+   guint n;
++  GError *local_error;
+ #endif
+ 
+   g_return_val_if_fail (POLKIT_IS_UNIX_PROCESS (process), 0);
+@@ -689,6 +708,7 @@ _polkit_unix_process_get_owner (PolkitUnixProcess  *process,
+     }
+ 
+   result = p.ki_uid;
++  start_time = (guint64) p.ki_start.tv_sec;
+ #else
+ 
+   /* see 'man proc' for layout of the status file
+@@ -722,17 +742,37 @@ _polkit_unix_process_get_owner (PolkitUnixProcess  *process,
+       else
+         {
+           result = real_uid;
+-          goto out;
++          goto found;
+         }
+     }
+-
+   g_set_error (error,
+                POLKIT_ERROR,
+                POLKIT_ERROR_FAILED,
+                "Didn't find any line starting with `Uid:' in file %s",
+                filename);
++  goto out;
++
++found:
++  /* The UID and start time are, sadly, not available in a single file.  So,
++   * read the UID first, and then the start time; if the start time is the same
++   * before and after reading the UID, it couldn't have changed.
++   */
++  local_error = NULL;
++  start_time = get_start_time_for_pid (process->pid, &local_error);
++  if (local_error != NULL)
++    {
++      g_propagate_error (error, local_error);
++      goto out;
++    }
+ #endif
+ 
++  if (process->start_time != start_time)
++    {
++      g_set_error (error, POLKIT_ERROR, POLKIT_ERROR_FAILED,
++		   "process with PID %d has been replaced", process->pid);
++      goto out;
++    }
++
+ out:
+   g_strfreev (lines);
+   g_free (contents);
+@@ -744,5 +784,5 @@ gint
+ polkit_unix_process_get_owner (PolkitUnixProcess  *process,
+                                GError            **error)
+ {
+-  return _polkit_unix_process_get_owner (process, error);
++  return polkit_unix_process_get_racy_uid__ (process, error);
+ }
+diff --git a/src/polkitbackend/polkitbackendinteractiveauthority.c b/src/polkitbackend/polkitbackendinteractiveauthority.c
+index 73d0a0e..97a8d80 100644
+--- a/src/polkitbackend/polkitbackendinteractiveauthority.c
++++ b/src/polkitbackend/polkitbackendinteractiveauthority.c
+@@ -563,7 +563,7 @@ log_result (PolkitBackendInteractiveAuthority    *authority,
+   if (polkit_authorization_result_get_is_authorized (result))
+     log_result_str = "ALLOWING";
+ 
+-  user_of_subject = polkit_backend_session_monitor_get_user_for_subject (priv->session_monitor, subject, NULL);
++  user_of_subject = polkit_backend_session_monitor_get_user_for_subject (priv->session_monitor, subject, NULL, NULL);
+ 
+   subject_str = polkit_subject_to_string (subject);
+ 
+@@ -837,6 +837,7 @@ polkit_backend_interactive_authority_check_authorization (PolkitBackendAuthority
+   gchar *subject_str;
+   PolkitIdentity *user_of_caller;
+   PolkitIdentity *user_of_subject;
++  gboolean user_of_subject_matches;
+   gchar *user_of_caller_str;
+   gchar *user_of_subject_str;
+   PolkitAuthorizationResult *result;
+@@ -882,7 +883,7 @@ polkit_backend_interactive_authority_check_authorization (PolkitBackendAuthority
+            action_id);
+ 
+   user_of_caller = polkit_backend_session_monitor_get_user_for_subject (priv->session_monitor,
+-                                                                        caller,
++                                                                        caller, NULL,
+                                                                         &error);
+   if (error != NULL)
+     {
+@@ -897,7 +898,7 @@ polkit_backend_interactive_authority_check_authorization (PolkitBackendAuthority
+   g_debug (" user of caller is %s", user_of_caller_str);
+ 
+   user_of_subject = polkit_backend_session_monitor_get_user_for_subject (priv->session_monitor,
+-                                                                         subject,
++                                                                         subject, &user_of_subject_matches,
+                                                                          &error);
+   if (error != NULL)
+     {
+@@ -927,7 +928,10 @@ polkit_backend_interactive_authority_check_authorization (PolkitBackendAuthority
+    * We only allow this if, and only if,
+    *
+    *  - processes may check for another process owned by the *same* user but not
+-   *    if details are passed (otherwise you'd be able to spoof the dialog)
++   *    if details are passed (otherwise you'd be able to spoof the dialog);
++   *    the caller supplies the user_of_subject value, so we additionally
++   *    require it to match at least at one point in time (via
++   *    user_of_subject_matches).
+    *
+    *  - processes running as uid 0 may check anything and pass any details
+    *
+@@ -935,7 +939,9 @@ polkit_backend_interactive_authority_check_authorization (PolkitBackendAuthority
+    *    then any uid referenced by that annotation is also allowed to check
+    *    to check anything and pass any details
+    */
+-  if (!polkit_identity_equal (user_of_caller, user_of_subject) || has_details)
++  if (!user_of_subject_matches
++      || !polkit_identity_equal (user_of_caller, user_of_subject)
++      || has_details)
+     {
+       if (!may_identity_check_authorization (interactive_authority, action_id, user_of_caller))
+         {
+@@ -1102,9 +1108,10 @@ check_authorization_sync (PolkitBackendAuthority         *authority,
+       goto out;
+     }
+ 
+-  /* every subject has a user */
++  /* every subject has a user; this is supplied by the client, so we rely
++   * on the caller to validate its acceptability. */
+   user_of_subject = polkit_backend_session_monitor_get_user_for_subject (priv->session_monitor,
+-                                                                         subject,
++                                                                         subject, NULL,
+                                                                          error);
+   if (user_of_subject == NULL)
+       goto out;
+@@ -2319,6 +2326,7 @@ polkit_backend_interactive_authority_register_authentication_agent (PolkitBacken
+   PolkitSubject *session_for_caller;
+   PolkitIdentity *user_of_caller;
+   PolkitIdentity *user_of_subject;
++  gboolean user_of_subject_matches;
+   AuthenticationAgent *agent;
+   gboolean ret;
+   gchar *caller_cmdline;
+@@ -2371,7 +2379,7 @@ polkit_backend_interactive_authority_register_authentication_agent (PolkitBacken
+       goto out;
+     }
+ 
+-  user_of_caller = polkit_backend_session_monitor_get_user_for_subject (priv->session_monitor, caller, NULL);
++  user_of_caller = polkit_backend_session_monitor_get_user_for_subject (priv->session_monitor, caller, NULL, NULL);
+   if (user_of_caller == NULL)
+     {
+       g_set_error (error,
+@@ -2380,7 +2388,7 @@ polkit_backend_interactive_authority_register_authentication_agent (PolkitBacken
+                    "Cannot determine user of caller");
+       goto out;
+     }
+-  user_of_subject = polkit_backend_session_monitor_get_user_for_subject (priv->session_monitor, subject, NULL);
++  user_of_subject = polkit_backend_session_monitor_get_user_for_subject (priv->session_monitor, subject, &user_of_subject_matches, NULL);
+   if (user_of_subject == NULL)
+     {
+       g_set_error (error,
+@@ -2389,7 +2397,8 @@ polkit_backend_interactive_authority_register_authentication_agent (PolkitBacken
+                    "Cannot determine user of subject");
+       goto out;
+     }
+-  if (!polkit_identity_equal (user_of_caller, user_of_subject))
++  if (!user_of_subject_matches
++      || !polkit_identity_equal (user_of_caller, user_of_subject))
+     {
+       if (POLKIT_IS_UNIX_USER (user_of_caller) && polkit_unix_user_get_uid (POLKIT_UNIX_USER (user_of_caller)) == 0)
+         {
+@@ -2482,6 +2491,7 @@ polkit_backend_interactive_authority_unregister_authentication_agent (PolkitBack
+   PolkitSubject *session_for_caller;
+   PolkitIdentity *user_of_caller;
+   PolkitIdentity *user_of_subject;
++  gboolean user_of_subject_matches;
+   AuthenticationAgent *agent;
+   gboolean ret;
+   gchar *scope_str;
+@@ -2530,7 +2540,7 @@ polkit_backend_interactive_authority_unregister_authentication_agent (PolkitBack
+       goto out;
+     }
+ 
+-  user_of_caller = polkit_backend_session_monitor_get_user_for_subject (priv->session_monitor, caller, NULL);
++  user_of_caller = polkit_backend_session_monitor_get_user_for_subject (priv->session_monitor, caller, NULL, NULL);
+   if (user_of_caller == NULL)
+     {
+       g_set_error (error,
+@@ -2539,7 +2549,7 @@ polkit_backend_interactive_authority_unregister_authentication_agent (PolkitBack
+                    "Cannot determine user of caller");
+       goto out;
+     }
+-  user_of_subject = polkit_backend_session_monitor_get_user_for_subject (priv->session_monitor, subject, NULL);
++  user_of_subject = polkit_backend_session_monitor_get_user_for_subject (priv->session_monitor, subject, &user_of_subject_matches, NULL);
+   if (user_of_subject == NULL)
+     {
+       g_set_error (error,
+@@ -2548,7 +2558,8 @@ polkit_backend_interactive_authority_unregister_authentication_agent (PolkitBack
+                    "Cannot determine user of subject");
+       goto out;
+     }
+-  if (!polkit_identity_equal (user_of_caller, user_of_subject))
++  if (!user_of_subject_matches
++      || !polkit_identity_equal (user_of_caller, user_of_subject))
+     {
+       if (POLKIT_IS_UNIX_USER (user_of_caller) && polkit_unix_user_get_uid (POLKIT_UNIX_USER (user_of_caller)) == 0)
+         {
+@@ -2658,7 +2669,7 @@ polkit_backend_interactive_authority_authentication_agent_response (PolkitBacken
+            identity_str);
+ 
+   user_of_caller = polkit_backend_session_monitor_get_user_for_subject (priv->session_monitor,
+-                                                                        caller,
++                                                                        caller, NULL,
+                                                                         error);
+   if (user_of_caller == NULL)
+     goto out;
+diff --git a/src/polkitbackend/polkitbackendsessionmonitor-systemd.c b/src/polkitbackend/polkitbackendsessionmonitor-systemd.c
+index 6bd517a..773256e 100644
+--- a/src/polkitbackend/polkitbackendsessionmonitor-systemd.c
++++ b/src/polkitbackend/polkitbackendsessionmonitor-systemd.c
+@@ -29,6 +29,7 @@
+ #include <stdlib.h>
+ 
+ #include <polkit/polkit.h>
++#include <polkit/polkitprivate.h>
+ #include "polkitbackendsessionmonitor.h"
+ 
+ /* <internal>
+@@ -246,26 +247,40 @@ polkit_backend_session_monitor_get_sessions (PolkitBackendSessionMonitor *monito
+  * polkit_backend_session_monitor_get_user:
+  * @monitor: A #PolkitBackendSessionMonitor.
+  * @subject: A #PolkitSubject.
++ * @result_matches: If not %NULL, set to indicate whether the return value matches current (RACY) state.
+  * @error: Return location for error.
+  *
+  * Gets the user corresponding to @subject or %NULL if no user exists.
+  *
++ * NOTE: For a #PolkitUnixProcess, the UID is read from @subject (which may
++ * come from e.g. a D-Bus client), so it may not correspond to the actual UID
++ * of the referenced process (at any point in time).  This is indicated by
++ * setting @result_matches to %FALSE; the caller may reject such subjects or
++ * require additional privileges. @result_matches == %TRUE only indicates that
++ * the UID matched the underlying process at ONE point in time, it may not match
++ * later.
++ *
+  * Returns: %NULL if @error is set otherwise a #PolkitUnixUser that should be freed with g_object_unref().
+  */
+ PolkitIdentity *
+ polkit_backend_session_monitor_get_user_for_subject (PolkitBackendSessionMonitor  *monitor,
+                                                      PolkitSubject                *subject,
++                                                     gboolean                     *result_matches,
+                                                      GError                      **error)
+ {
+   PolkitIdentity *ret;
+-  guint32 uid;
++  gboolean matches;
+ 
+   ret = NULL;
++  matches = FALSE;
+ 
+   if (POLKIT_IS_UNIX_PROCESS (subject))
+     {
+-      uid = polkit_unix_process_get_uid (POLKIT_UNIX_PROCESS (subject));
+-      if ((gint) uid == -1)
++      gint subject_uid, current_uid;
++      GError *local_error;
++
++      subject_uid = polkit_unix_process_get_uid (POLKIT_UNIX_PROCESS (subject));
++      if (subject_uid == -1)
+         {
+           g_set_error (error,
+                        POLKIT_ERROR,
+@@ -273,14 +288,24 @@ polkit_backend_session_monitor_get_user_for_subject (PolkitBackendSessionMonitor
+                        "Unix process subject does not have uid set");
+           goto out;
+         }
+-      ret = polkit_unix_user_new (uid);
++      local_error = NULL;
++      current_uid = polkit_unix_process_get_racy_uid__ (POLKIT_UNIX_PROCESS (subject), &local_error);
++      if (local_error != NULL)
++	{
++	  g_propagate_error (error, local_error);
++	  goto out;
++	}
++      ret = polkit_unix_user_new (subject_uid);
++      matches = (subject_uid == current_uid);
+     }
+   else if (POLKIT_IS_SYSTEM_BUS_NAME (subject))
+     {
+       ret = (PolkitIdentity*)polkit_system_bus_name_get_user_sync (POLKIT_SYSTEM_BUS_NAME (subject), NULL, error);
++      matches = TRUE;
+     }
+   else if (POLKIT_IS_UNIX_SESSION (subject))
+     {
++      uid_t uid;
+ 
+       if (sd_session_get_uid (polkit_unix_session_get_session_id (POLKIT_UNIX_SESSION (subject)), &uid) < 0)
+         {
+@@ -292,9 +317,14 @@ polkit_backend_session_monitor_get_user_for_subject (PolkitBackendSessionMonitor
+         }
+ 
+       ret = polkit_unix_user_new (uid);
++      matches = TRUE;
+     }
+ 
+  out:
++  if (result_matches != NULL)
++    {
++      *result_matches = matches;
++    }
+   return ret;
+ }
+ 
+diff --git a/src/polkitbackend/polkitbackendsessionmonitor.c b/src/polkitbackend/polkitbackendsessionmonitor.c
+index e1a9ab3..ed30755 100644
+--- a/src/polkitbackend/polkitbackendsessionmonitor.c
++++ b/src/polkitbackend/polkitbackendsessionmonitor.c
+@@ -27,6 +27,7 @@
+ #include <glib/gstdio.h>
+ 
+ #include <polkit/polkit.h>
++#include <polkit/polkitprivate.h>
+ #include "polkitbackendsessionmonitor.h"
+ 
+ #define CKDB_PATH "/var/run/ConsoleKit/database"
+@@ -273,28 +274,40 @@ polkit_backend_session_monitor_get_sessions (PolkitBackendSessionMonitor *monito
+  * polkit_backend_session_monitor_get_user:
+  * @monitor: A #PolkitBackendSessionMonitor.
+  * @subject: A #PolkitSubject.
++ * @result_matches: If not %NULL, set to indicate whether the return value matches current (RACY) state.
+  * @error: Return location for error.
+  *
+  * Gets the user corresponding to @subject or %NULL if no user exists.
+  *
++ * NOTE: For a #PolkitUnixProcess, the UID is read from @subject (which may
++ * come from e.g. a D-Bus client), so it may not correspond to the actual UID
++ * of the referenced process (at any point in time).  This is indicated by
++ * setting @result_matches to %FALSE; the caller may reject such subjects or
++ * require additional privileges. @result_matches == %TRUE only indicates that
++ * the UID matched the underlying process at ONE point in time, it may not match
++ * later.
++ *
+  * Returns: %NULL if @error is set otherwise a #PolkitUnixUser that should be freed with g_object_unref().
+  */
+ PolkitIdentity *
+ polkit_backend_session_monitor_get_user_for_subject (PolkitBackendSessionMonitor  *monitor,
+                                                      PolkitSubject                *subject,
++                                                     gboolean                     *result_matches,
+                                                      GError                      **error)
+ {
+   PolkitIdentity *ret;
++  gboolean matches;
+   GError *local_error;
+-  gchar *group;
+-  guint32 uid;
+ 
+   ret = NULL;
++  matches = FALSE;
+ 
+   if (POLKIT_IS_UNIX_PROCESS (subject))
+     {
+-      uid = polkit_unix_process_get_uid (POLKIT_UNIX_PROCESS (subject));
+-      if ((gint) uid == -1)
++      gint subject_uid, current_uid;
++
++      subject_uid = polkit_unix_process_get_uid (POLKIT_UNIX_PROCESS (subject));
++      if (subject_uid == -1)
+         {
+           g_set_error (error,
+                        POLKIT_ERROR,
+@@ -302,14 +315,26 @@ polkit_backend_session_monitor_get_user_for_subject (PolkitBackendSessionMonitor
+                        "Unix process subject does not have uid set");
+           goto out;
+         }
+-      ret = polkit_unix_user_new (uid);
++      local_error = NULL;
++      current_uid = polkit_unix_process_get_racy_uid__ (POLKIT_UNIX_PROCESS (subject), &local_error);
++      if (local_error != NULL)
++	{
++	  g_propagate_error (error, local_error);
++	  goto out;
++	}
++      ret = polkit_unix_user_new (subject_uid);
++      matches = (subject_uid == current_uid);
+     }
+   else if (POLKIT_IS_SYSTEM_BUS_NAME (subject))
+     {
+       ret = (PolkitIdentity*)polkit_system_bus_name_get_user_sync (POLKIT_SYSTEM_BUS_NAME (subject), NULL, error);
++      matches = TRUE;
+     }
+   else if (POLKIT_IS_UNIX_SESSION (subject))
+     {
++      gint uid;
++      gchar *group;
++
+       if (!ensure_database (monitor, error))
+         {
+           g_prefix_error (error, "Error getting user for session: Error ensuring CK database at " CKDB_PATH ": ");
+@@ -328,9 +353,14 @@ polkit_backend_session_monitor_get_user_for_subject (PolkitBackendSessionMonitor
+       g_free (group);
+ 
+       ret = polkit_unix_user_new (uid);
++      matches = TRUE;
+     }
+ 
+  out:
++  if (result_matches != NULL)
++    {
++      *result_matches = matches;
++    }
+   return ret;
+ }
+ 
+diff --git a/src/polkitbackend/polkitbackendsessionmonitor.h b/src/polkitbackend/polkitbackendsessionmonitor.h
+index 8f8a2ca..3972326 100644
+--- a/src/polkitbackend/polkitbackendsessionmonitor.h
++++ b/src/polkitbackend/polkitbackendsessionmonitor.h
+@@ -47,6 +47,7 @@ GList                       *polkit_backend_session_monitor_get_sessions (Polkit
+ 
+ PolkitIdentity              *polkit_backend_session_monitor_get_user_for_subject (PolkitBackendSessionMonitor *monitor,
+                                                                                   PolkitSubject               *subject,
++                                                                                  gboolean                    *result_matches,
+                                                                                   GError                     **error);
+ 
+ PolkitSubject               *polkit_backend_session_monitor_get_session_for_subject (PolkitBackendSessionMonitor *monitor,
diff -Nru policykit-1-0.105/debian/patches/series policykit-1-0.105/debian/patches/series
--- policykit-1-0.105/debian/patches/series	2016-09-06 17:53:11.000000000 +0200
+++ policykit-1-0.105/debian/patches/series	2018-07-27 15:30:41.000000000 +0200
@@ -34,3 +34,4 @@
 05_revert-admin-identities-unix-group-wheel.patch
 06_systemd-service.patch
 10_build-against-libsystemd.patch
+CVE-2018-1116.patch

Reply to: