login: fix pos-array allocation

[elogind.git] / src / login / logind-acl.c

diff --git a/src/login/logind-acl.c b/src/login/logind-acl.c
index 25abcbcf80b83c172a881f5da1878e84a898dcf8..dc86f0f1a2c3557394e6f2577ef40857975bf882 100644 (file)
--- a/src/login/logind-acl.c
+++ b/src/login/logind-acl.c
@@ -20,15 +20,16 @@
 ***/
 
 #include <assert.h>
 ***/
 
 #include <assert.h>

-#include <sys/acl.h>
-#include <acl/libacl.h>

 #include <errno.h>
 #include <string.h>
 #include <errno.h>
 #include <string.h>

+#include <sys/acl.h>
+#include <acl/libacl.h>

 
 

-#include "logind-acl.h"

 #include "util.h"
 #include "acl-util.h"
 #include "set.h"
 #include "util.h"
 #include "acl-util.h"
 #include "set.h"

+#include "logind-acl.h"
+#include "udev-util.h"

 
 static int flush_acl(acl_t acl) {
         acl_entry_t i;
 
 static int flush_acl(acl_t acl) {
         acl_entry_t i;


@@ -178,27 +179,24 @@ int devnode_acl_all(struct udev *udev,
                     bool del, uid_t old_uid,
                     bool add, uid_t new_uid) {
 
                     bool del, uid_t old_uid,
                     bool add, uid_t new_uid) {
 

+        _cleanup_udev_enumerate_unref_ struct udev_enumerate *e = NULL;

         struct udev_list_entry *item = NULL, *first = NULL;
         struct udev_list_entry *item = NULL, *first = NULL;

-        struct udev_enumerate *e;
-        Set *nodes;
-        Iterator i;
-        char *n;
+        _cleanup_set_free_free_ Set *nodes = NULL;

         _cleanup_closedir_ DIR *dir = NULL;
         struct dirent *dent;
         _cleanup_closedir_ DIR *dir = NULL;
         struct dirent *dent;

+        Iterator i;
+        char *n;

         int r;
 
         assert(udev);
 
         nodes = set_new(string_hash_func, string_compare_func);
         int r;
 
         assert(udev);
 
         nodes = set_new(string_hash_func, string_compare_func);

-        if (!nodes) {
+        if (!nodes)

                 return -ENOMEM;
                 return -ENOMEM;

-        }

 
         e = udev_enumerate_new(udev);
 
         e = udev_enumerate_new(udev);

-        if (!e) {
-                r = -ENOMEM;
-                goto finish;
-        }
+        if (!e)
+                return -ENOMEM;

 
         if (isempty(seat))
                 seat = "seat0";
 
         if (isempty(seat))
                 seat = "seat0";


@@ -210,85 +208,80 @@ int devnode_acl_all(struct udev *udev,
          * second tag manually in our loop is a good solution. */
         r = udev_enumerate_add_match_tag(e, "uaccess");
         if (r < 0)
          * second tag manually in our loop is a good solution. */
         r = udev_enumerate_add_match_tag(e, "uaccess");
         if (r < 0)

-                goto finish;
+                return r;
+
+        r = udev_enumerate_add_match_is_initialized(e);
+        if (r < 0)
+                return r;

 
         r = udev_enumerate_scan_devices(e);
         if (r < 0)
 
         r = udev_enumerate_scan_devices(e);
         if (r < 0)

-                goto finish;
+                return r;

 
         first = udev_enumerate_get_list_entry(e);
         udev_list_entry_foreach(item, first) {
 
         first = udev_enumerate_get_list_entry(e);
         udev_list_entry_foreach(item, first) {

-                struct udev_device *d;
+                _cleanup_udev_device_unref_ struct udev_device *d = NULL;

                 const char *node, *sn;
 
                 d = udev_device_new_from_syspath(udev, udev_list_entry_get_name(item));
                 const char *node, *sn;
 
                 d = udev_device_new_from_syspath(udev, udev_list_entry_get_name(item));

-                if (!d) {
-                        r = -ENOMEM;
-                        goto finish;
-                }
+                if (!d)
+                        return -ENOMEM;

 
                 sn = udev_device_get_property_value(d, "ID_SEAT");
                 if (isempty(sn))
                         sn = "seat0";
 
 
                 sn = udev_device_get_property_value(d, "ID_SEAT");
                 if (isempty(sn))
                         sn = "seat0";
 

-                if (!streq(seat, sn)) {
-                        udev_device_unref(d);
+                if (!streq(seat, sn))

                         continue;
                         continue;

-                }

 
                 node = udev_device_get_devnode(d);
 
                 node = udev_device_get_devnode(d);

-                if (!node) {
-                        /* In case people mistag devices with nodes, we need to ignore this */
-                        udev_device_unref(d);
+                /* In case people mistag devices with nodes, we need to ignore this */
+                if (!node)

                         continue;
                         continue;

-                }

 
                 n = strdup(node);
 
                 n = strdup(node);

-                udev_device_unref(d);

                 if (!n)
                 if (!n)

-                        goto finish;
+                        return -ENOMEM;

 
                 log_debug("Found udev node %s for seat %s", n, seat);
 
                 log_debug("Found udev node %s for seat %s", n, seat);

-                r = set_put(nodes, n);
+                r = set_consume(nodes, n);

                 if (r < 0)
                 if (r < 0)

-                        goto finish;
+                        return r;

         }
 
         /* udev exports "dead" device nodes to allow module on-demand loading,
          * these devices are not known to the kernel at this moment */
         dir = opendir("/run/udev/static_node-tags/uaccess");
         if (dir) {
         }
 
         /* udev exports "dead" device nodes to allow module on-demand loading,
          * these devices are not known to the kernel at this moment */
         dir = opendir("/run/udev/static_node-tags/uaccess");
         if (dir) {

-                FOREACH_DIRENT(dent, dir, r = -errno; goto finish) {
+                FOREACH_DIRENT(dent, dir, return -errno) {

                         _cleanup_free_ char *unescaped_devname = NULL;
 
                         unescaped_devname = cunescape(dent->d_name);
                         _cleanup_free_ char *unescaped_devname = NULL;
 
                         unescaped_devname = cunescape(dent->d_name);

-                        if (unescaped_devname == NULL) {
-                                r = -ENOMEM;
-                                goto finish;
-                        }
+                        if (!unescaped_devname)
+                                return -ENOMEM;

 
                         n = strappend("/dev/", unescaped_devname);
 
                         n = strappend("/dev/", unescaped_devname);

-                        if (!n) {
-                                r = -ENOMEM;
-                                goto finish;
-                        }
+                        if (!n)
+                                return -ENOMEM;

 
                         log_debug("Found static node %s for seat %s", n, seat);
 
                         log_debug("Found static node %s for seat %s", n, seat);

-                        r = set_put(nodes, n);
-                        if (r < 0 && r != -EEXIST)
-                                goto finish;
-                        else
-                                r = 0;
+                        r = set_consume(nodes, n);
+                        if (r == -EEXIST)
+                                continue;
+                        if (r < 0)
+                                return r;

                 }
         }
 
                 }
         }
 

+        r = 0;

         SET_FOREACH(n, nodes, i) {
         SET_FOREACH(n, nodes, i) {

+                int k;
+

                 log_debug("Fixing up ACLs at %s for seat %s", n, seat);
                 log_debug("Fixing up ACLs at %s for seat %s", n, seat);

-                r = devnode_acl(n, flush, del, old_uid, add, new_uid);
+                k = devnode_acl(n, flush, del, old_uid, add, new_uid);
+                if (k < 0)
+                        r = k;

         }
 
         }
 

-finish:
-        udev_enumerate_unref(e);
-        set_free_free(nodes);

         return r;
 }
         return r;
 }