Attachment 112912 Details for Bug 88811 – [1.8] bus_driver_get_owner_of_name: factor out from bus_driver_get_conn_helper

[patch] [1.8] bus_driver_get_owner_of_name: factor out from bus_driver_get_conn_helper

0002-bus_driver_get_owner_of_name-factor-out-from-bus_dri.patch (text/plain), 2.38 KB, created by Simon McVittie on 2015-01-28 14:48:02 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Simon McVittie

Created: 2015-01-28 14:48:02 UTC

Size: 2.38 KB

patch

obsolete

>From 4235cbac853c434a9c926a40ffc56406056479d3 Mon Sep 17 00:00:00 2001
>From: Simon McVittie <simon.mcvittie@collabora.co.uk>
>Date: Mon, 26 Jan 2015 20:06:04 +0000
>Subject: [PATCH 2/3] bus_driver_get_owner_of_name: factor out from
> bus_driver_get_conn_helper
>
>We need this, or something equivalent, to address CVE-2015-0245 via
>code changes.
>---
> bus/driver.c | 32 +++++++++++++++++++++-----------
> 1 file changed, 21 insertions(+), 11 deletions(-)
>
>diff --git a/bus/driver.c b/bus/driver.c
>index f5d3ebe..9551f3d 100644
>--- a/bus/driver.c
>+++ b/bus/driver.c
>@@ -41,17 +41,32 @@
> #include <string.h>
> 
> static DBusConnection *
>+bus_driver_get_owner_of_name (DBusConnection *connection,
>+                              const char     *name)
>+{
>+  BusRegistry *registry;
>+  BusService *serv;
>+  DBusString str;
>+
>+  registry = bus_connection_get_registry (connection);
>+  _dbus_string_init_const (&str, name);
>+  serv = bus_registry_lookup (registry, &str);
>+
>+  if (serv == NULL)
>+    return NULL;
>+
>+  return bus_service_get_primary_owners_connection (serv);
>+}
>+
>+static DBusConnection *
> bus_driver_get_conn_helper (DBusConnection  *connection,
>                             DBusMessage     *message,
>                             const char      *what_we_want,
>                             const char     **name_p,
>                             DBusError       *error)
> {
>-  const char *name;
>-  BusRegistry *registry;
>-  BusService *serv;
>-  DBusString str;
>   DBusConnection *conn;
>+  const char *name;
> 
>   if (!dbus_message_get_args (message, error,
>                               DBUS_TYPE_STRING, &name,
>@@ -61,11 +76,9 @@ bus_driver_get_conn_helper (DBusConnection  *connection,
>   _dbus_assert (name != NULL);
>   _dbus_verbose ("asked for %s of connection %s\n", what_we_want, name);
> 
>-  registry = bus_connection_get_registry (connection);
>-  _dbus_string_init_const (&str, name);
>-  serv = bus_registry_lookup (registry, &str);
>+  conn = bus_driver_get_owner_of_name (connection, name);
> 
>-  if (serv == NULL)
>+  if (conn == NULL)
>     {
>       dbus_set_error (error, DBUS_ERROR_NAME_HAS_NO_OWNER,
>                       "Could not get %s of name '%s': no such name",
>@@ -73,9 +86,6 @@ bus_driver_get_conn_helper (DBusConnection  *connection,
>       return NULL;
>     }
> 
>-  conn = bus_service_get_primary_owners_connection (serv);
>-  _dbus_assert (conn != NULL);
>-
>   if (name_p != NULL)
>     *name_p = name;
> 
>-- 
>2.1.4
>

Actions: View | Splinter Review

Attachments on bug 88811: 112849 | 112850 | 112851 | 112852 | 112911 | 112912 | 112913

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.