Attachment 39878 Details for Bug 30938 – [PATCH] policy: check against primary group as well, not just auxiliary groups (fd.o#30938)

[patch] [PATCH] policy: check against primary group as well, not just auxiliary groups (fd.o#30938)

0001-policy-check-against-primary-group-as-well-not-just-.patch (text/plain), 1.58 KB, created by Sascha Silbe on 2010-10-28 23:55:48 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Sascha Silbe

Created: 2010-10-28 23:55:48 UTC

Size: 1.58 KB

patch

obsolete

>From 929f3d7ad723742df83dd160c91856caaefa9c16 Mon Sep 17 00:00:00 2001
>From: Sascha Silbe <sascha-pgp@silbe.org>
>Date: Sun, 17 Oct 2010 17:50:31 +0200
>Subject: [PATCH] policy: check against primary group as well, not just auxiliary groups (fd.o#30938)
>Mail-Followup-To: <dbus@lists.freedesktop.org>
>
>For some use cases the group a policy wants to match against is the primary
>group of the user, not an auxiliary one.
>
>Signed-off-by: Sascha Silbe <sascha-pgp@silbe.org>
>---
> dbus/dbus-userdb-util.c |   19 ++++++++++---------
> 1 files changed, 10 insertions(+), 9 deletions(-)
>
>diff --git a/dbus/dbus-userdb-util.c b/dbus/dbus-userdb-util.c
>index c44c014..54dc1f1 100644
>--- a/dbus/dbus-userdb-util.c
>+++ b/dbus/dbus-userdb-util.c
>@@ -379,18 +379,19 @@ _dbus_groups_from_uid (dbus_uid_t         uid,
> 
>   _dbus_assert (info->uid == uid);
>   
>-  if (info->n_group_ids > 0)
>+  *group_ids = dbus_new (dbus_gid_t, info->n_group_ids+1);
>+  if (*group_ids == NULL)
>     {
>-      *group_ids = dbus_new (dbus_gid_t, info->n_group_ids);
>-      if (*group_ids == NULL)
>-        {
>-	  _dbus_user_database_unlock_system ();
>-          return FALSE;
>-        }
>+      _dbus_user_database_unlock_system ();
>+      return FALSE;
>+    }
> 
>-      *n_group_ids = info->n_group_ids;
>+  *n_group_ids = info->n_group_ids+1;
>+  **group_ids = info->primary_gid;
> 
>-      memcpy (*group_ids, info->group_ids, info->n_group_ids * sizeof (dbus_gid_t));
>+  if (info->n_group_ids > 0)
>+    {
>+      memcpy (&(*group_ids)[1], info->group_ids, (info->n_group_ids) * sizeof (dbus_gid_t));
>     }
> 
>   _dbus_user_database_unlock_system ();
>-- 
>1.7.1
>

Actions: View | Splinter Review

Attachments on bug 30938: 39878 | 84739

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.