From 0aad0e32d93d848e707a3cd0edd78c58a4c21829 Mon Sep 17 00:00:00 2001

From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>

Date: Sat, 12 Oct 2013 20:28:21 -0400

Subject: [PATCH] Introduce udev object cleanup functions

Conflicts:

	src/backlight/backlight.c

	src/gpt-auto-generator/gpt-auto-generator.c

(cherry picked from commit 1ca208fb4f93e5869704af1812cbff7130a2fc03)

Related: #1098310

---

 Makefile.am                                 |   1 +

 src/backlight/backlight.c                   |  57 +++++------

 src/core/umount.c                           | 143 ++++++++++------------------

 src/cryptsetup/cryptsetup.c                 |  27 ++----

 src/fsck/fsck.c                             |  13 +--

 src/gpt-auto-generator/gpt-auto-generator.c | 121 +++++++----------------

 src/journal/journal-internal.h              |   7 +-

 src/login/sysfs-show.c                      |  22 ++---

 src/readahead/readahead-common.c            |  66 +++++--------

 src/shared/fdset.h                          |   5 +-

 src/shared/install.c                        |   6 +-

 src/shared/set.h                            |  10 +-

 src/shared/strv.h                           |   7 +-

 src/shared/udev-util.h                      |  37 +++++++

 src/shared/util.h                           |  33 +++----

 src/test/test-libudev.c                     |   8 +-

 src/test/test-udev.c                        |  21 ++--

 src/tmpfiles/tmpfiles.c                     |   5 +-

 18 files changed, 227 insertions(+), 362 deletions(-)

 create mode 100644 src/shared/udev-util.h

diff --git a/Makefile.am b/Makefile.am

index fa2fba6..ef73138 100644

--- a/Makefile.am

+++ b/Makefile.am

@@ -647,6 +647,7 @@ libsystemd_shared_la_SOURCES = \

 	src/shared/sparse-endian.h \

 	src/shared/util.c \

 	src/shared/util.h \

+	src/shared/udev-util.h \

 	src/shared/virt.c \

 	src/shared/virt.h \

 	src/shared/efivars.c \

diff --git a/src/backlight/backlight.c b/src/backlight/backlight.c

index 9b2eada..aa80c29 100644

--- a/src/backlight/backlight.c

+++ b/src/backlight/backlight.c

@@ -19,15 +19,15 @@

   along with systemd; If not, see <http://www.gnu.org/licenses/>.

 ***/

-#include <libudev.h>

-

 #include "util.h"

 #include "mkdir.h"

 #include "fileio.h"

+#include "libudev.h"

+#include "udev-util.h"

 int main(int argc, char *argv[]) {

-        struct udev *udev = NULL;

-        struct udev_device *device = NULL;

+        _cleanup_udev_unref_ struct udev *udev = NULL;

+        _cleanup_udev_device_unref_ struct udev_device *device = NULL;

         _cleanup_free_ char *saved = NULL;

         int r;

@@ -45,37 +45,35 @@ int main(int argc, char *argv[]) {

         r = mkdir_p("/var/lib/systemd/backlight", 0755);

         if (r < 0) {

                 log_error("Failed to create backlight directory: %s", strerror(-r));

-                goto finish;

+                return EXIT_FAILURE;

         }

         udev = udev_new();

         if (!udev) {

-                r = log_oom();

-                goto finish;

+                log_oom();

+                return EXIT_FAILURE;

         }

         errno = 0;

         device = udev_device_new_from_subsystem_sysname(udev, "backlight", argv[2]);

         if (!device) {

-                if (errno != 0) {

+                if (errno != 0)

                         log_error("Failed to get backlight device: %m");

-                        r = -errno;

-                } else

-                        r = log_oom();

+                else

+                        log_oom();

-                goto finish;

+                return EXIT_FAILURE;

         }

         if (!streq_ptr(udev_device_get_subsystem(device), "backlight")) {

                 log_error("Not a backlight device: %s", argv[2]);

-                r = -ENODEV;

-                goto finish;

+                return EXIT_FAILURE;

         }

         saved = strappend("/var/lib/systemd/backlight/", udev_device_get_sysname(device));

         if (!saved) {

-                r = log_oom();

-                goto finish;

+                log_oom();

+                return EXIT_FAILURE;

         }

         if (streq(argv[1], "load")) {

@@ -84,19 +82,17 @@ int main(int argc, char *argv[]) {

                 r = read_one_line_file(saved, &value);

                 if (r < 0) {

-                        if (r == -ENOENT) {

-                                r = 0;

-                                goto finish;

-                        }

+                        if (r == -ENOENT)

+                                return EXIT_SUCCESS;

                         log_error("Failed to read %s: %s", saved, strerror(-r));

-                        goto finish;

+                        return EXIT_FAILURE;

                 }

                 r = udev_device_set_sysattr_value(device, "brightness", value);

                 if (r < 0) {

                         log_error("Failed to write system attribute: %s", strerror(-r));

-                        goto finish;

+                        return EXIT_FAILURE;

                 }

         } else if (streq(argv[1], "save")) {

@@ -105,28 +101,19 @@ int main(int argc, char *argv[]) {

                 value = udev_device_get_sysattr_value(device, "brightness");

                 if (!value) {

                         log_error("Failed to read system attribute: %s", strerror(-r));

-                        goto finish;

+                        return EXIT_FAILURE;

                 }

                 r = write_string_file(saved, value);

                 if (r < 0) {

                         log_error("Failed to write %s: %s", saved, strerror(-r));

-                        goto finish;

+                        return EXIT_FAILURE;

                 }

         } else {

                 log_error("Unknown verb %s.", argv[1]);

-                r = -EINVAL;

-                goto finish;

+                return EXIT_FAILURE;

         }

-finish:

-        if (device)

-                udev_device_unref(device);

-

-        if (udev)

-                udev_unref(udev);

-

-        return r < 0 ? EXIT_FAILURE : EXIT_SUCCESS;

-

+        return EXIT_SUCCESS;

 }

diff --git a/src/core/umount.c b/src/core/umount.c

index 1e95ad7..99dbe27 100644

--- a/src/core/umount.c

+++ b/src/core/umount.c

@@ -27,7 +27,6 @@

 #include <unistd.h>

 #include <linux/loop.h>

 #include <linux/dm-ioctl.h>

-#include <libudev.h>

 #include "list.h"

 #include "mount-setup.h"

@@ -35,6 +34,8 @@

 #include "path-util.h"

 #include "util.h"

 #include "virt.h"

+#include "libudev.h"

+#include "udev-util.h"

 typedef struct MountPoint {

         char *path;

@@ -201,145 +202,108 @@ finish:

 }

 static int loopback_list_get(MountPoint **head) {

-        int r;

-        struct udev *udev;

-        struct udev_enumerate *e = NULL;

+        _cleanup_udev_unref_ struct udev *udev;

+        _cleanup_udev_enumerate_unref_ struct udev_enumerate *e = NULL;

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

         assert(head);

-        if (!(udev = udev_new())) {

-                r = -ENOMEM;

-                goto finish;

-        }

+        udev = udev_new();

+        if (!udev)

+                return -ENOMEM;

-        if (!(e = udev_enumerate_new(udev))) {

-                r = -ENOMEM;

-                goto finish;

-        }

+        e = udev_enumerate_new(udev);

+        if (!e)

+                return -ENOMEM;

         if (udev_enumerate_add_match_subsystem(e, "block") < 0 ||

             udev_enumerate_add_match_sysname(e, "loop*") < 0 ||

-            udev_enumerate_add_match_sysattr(e, "loop/backing_file", NULL) < 0) {

-                r = -EIO;

-                goto finish;

-        }

+            udev_enumerate_add_match_sysattr(e, "loop/backing_file", NULL) < 0)

+                return -EIO;

-        if (udev_enumerate_scan_devices(e) < 0) {

-                r = -EIO;

-                goto finish;

-        }

+        if (udev_enumerate_scan_devices(e) < 0)

+                return -EIO;

         first = udev_enumerate_get_list_entry(e);

         udev_list_entry_foreach(item, first) {

                 MountPoint *lb;

-                struct udev_device *d;

+                _cleanup_udev_device_unref_ struct udev_device *d;

                 char *loop;

                 const char *dn;

-                if (!(d = udev_device_new_from_syspath(udev, udev_list_entry_get_name(item)))) {

-                        r = -ENOMEM;

-                        goto finish;

-                }

+                d = udev_device_new_from_syspath(udev, udev_list_entry_get_name(item));

+                if (!d)

+                        return -ENOMEM;

-                if (!(dn = udev_device_get_devnode(d))) {

-                        udev_device_unref(d);

+                dn = udev_device_get_devnode(d);

+                if (!dn)

                         continue;

-                }

                 loop = strdup(dn);

-                udev_device_unref(d);

-

-                if (!loop) {

-                        r = -ENOMEM;

-                        goto finish;

-                }

+                if (!loop)

+                        return -ENOMEM;

-                if (!(lb = new0(MountPoint, 1))) {

+                lb = new0(MountPoint, 1);

+                if (!lb) {

                         free(loop);

-                        r = -ENOMEM;

-                        goto finish;

+                        return -ENOMEM;

                 }

                 lb->path = loop;

                 LIST_PREPEND(MountPoint, mount_point, *head, lb);

         }

-        r = 0;

-

-finish:

-        if (e)

-                udev_enumerate_unref(e);

-

-        if (udev)

-                udev_unref(udev);

-

-        return r;

+        return 0;

 }

 static int dm_list_get(MountPoint **head) {

-        int r;

-        struct udev *udev;

-        struct udev_enumerate *e = NULL;

+        _cleanup_udev_unref_ struct udev *udev;

+        _cleanup_udev_enumerate_unref_ struct udev_enumerate *e = NULL;

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

         assert(head);

-        if (!(udev = udev_new())) {

-                r = -ENOMEM;

-                goto finish;

-        }

+        udev = udev_new();

+        if (!udev)

+                return -ENOMEM;

-        if (!(e = udev_enumerate_new(udev))) {

-                r = -ENOMEM;

-                goto finish;

-        }

+        e = udev_enumerate_new(udev);

+        if (!e)

+                return -ENOMEM;

         if (udev_enumerate_add_match_subsystem(e, "block") < 0 ||

-            udev_enumerate_add_match_sysname(e, "dm-*") < 0) {

-                r = -EIO;

-                goto finish;

-        }

+            udev_enumerate_add_match_sysname(e, "dm-*") < 0)

+                return -EIO;

-        if (udev_enumerate_scan_devices(e) < 0) {

-                r = -EIO;

-                goto finish;

-        }

+        if (udev_enumerate_scan_devices(e) < 0)

+                return -EIO;

         first = udev_enumerate_get_list_entry(e);

         udev_list_entry_foreach(item, first) {

                 MountPoint *m;

-                struct udev_device *d;

+                _cleanup_udev_device_unref_ struct udev_device *d;

                 dev_t devnum;

                 char *node;

                 const char *dn;

-                if (!(d = udev_device_new_from_syspath(udev, udev_list_entry_get_name(item)))) {

-                        r = -ENOMEM;

-                        goto finish;

-                }

+                d = udev_device_new_from_syspath(udev, udev_list_entry_get_name(item));

+                if (!d)

+                        return -ENOMEM;

                 devnum = udev_device_get_devnum(d);

                 dn = udev_device_get_devnode(d);

-

-                if (major(devnum) == 0 || !dn) {

-                        udev_device_unref(d);

+                if (major(devnum) == 0 || !dn)

                         continue;

-                }

                 node = strdup(dn);

-                udev_device_unref(d);

-

-                if (!node) {

-                        r = -ENOMEM;

-                        goto finish;

-                }

+                if (!node)

+                        return -ENOMEM;

-                if (!(m = new(MountPoint, 1))) {

+                m = new(MountPoint, 1);

+                if (!m) {

                         free(node);

-                        r = -ENOMEM;

-                        goto finish;

+                        return -ENOMEM;

                 }

                 m->path = node;

@@ -347,16 +311,7 @@ static int dm_list_get(MountPoint **head) {

                 LIST_PREPEND(MountPoint, mount_point, *head, m);

         }

-        r = 0;

-

-finish:

-        if (e)

-                udev_enumerate_unref(e);

-

-        if (udev)

-                udev_unref(udev);

-

-        return r;

+        return 0;

 }

 static int delete_loopback(const char *device) {

diff --git a/src/cryptsetup/cryptsetup.c b/src/cryptsetup/cryptsetup.c

index 4f2f52a..0a15b50 100644

--- a/src/cryptsetup/cryptsetup.c

+++ b/src/cryptsetup/cryptsetup.c

@@ -25,7 +25,6 @@

 #include <mntent.h>

 #include <libcryptsetup.h>

-#include <libudev.h>

 #include "fileio.h"

 #include "log.h"

@@ -34,6 +33,8 @@

 #include "strv.h"

 #include "ask-password-api.h"

 #include "def.h"

+#include "libudev.h"

+#include "udev-util.h"

 static const char *opt_type = NULL; /* CRYPT_LUKS1, CRYPT_TCRYPT or CRYPT_PLAIN */

 static char *opt_cipher = NULL;

@@ -184,7 +185,7 @@ static void log_glue(int level, const char *msg, void *usrptr) {

         log_debug("%s", msg);

 }

-static char *disk_description(const char *path) {

+static char* disk_description(const char *path) {

         static const char name_fields[] = {

                 "ID_PART_ENTRY_NAME\0"

@@ -193,10 +194,9 @@ static char *disk_description(const char *path) {

                 "ID_MODEL\0"

         };

-        struct udev *udev = NULL;

-        struct udev_device *device = NULL;

+        _cleanup_udev_unref_ struct udev *udev = NULL;

+        _cleanup_udev_device_unref_ struct udev_device *device = NULL;

         struct stat st;

-        char *description = NULL;

         const char *i;

         assert(path);

@@ -213,26 +213,17 @@ static char *disk_description(const char *path) {

         device = udev_device_new_from_devnum(udev, 'b', st.st_rdev);

         if (!device)

-                goto finish;

+                return NULL;

         NULSTR_FOREACH(i, name_fields) {

                 const char *name;

                 name = udev_device_get_property_value(device, i);

-                if (!isempty(name)) {

-                        description = strdup(name);

-                        break;

-                }

+                if (!isempty(name))

+                        return strdup(name);

         }

-finish:

-        if (device)

-                udev_device_unref(device);

-

-        if (udev)

-                udev_unref(udev);

-

-        return description;

+        return NULL;

 }

 static char *disk_mount_point(const char *label) {

diff --git a/src/fsck/fsck.c b/src/fsck/fsck.c

index f298cf7..96a79dd 100644

--- a/src/fsck/fsck.c

+++ b/src/fsck/fsck.c

@@ -27,7 +27,6 @@

 #include <fcntl.h>

 #include <sys/file.h>

-#include <libudev.h>

 #include <dbus/dbus.h>

 #include "util.h"

@@ -36,6 +35,8 @@

 #include "bus-errors.h"

 #include "virt.h"

 #include "fileio.h"

+#include "libudev.h"

+#include "udev-util.h"

 static bool arg_skip = false;

 static bool arg_force = false;

@@ -251,8 +252,8 @@ int main(int argc, char *argv[]) {

         int i = 0, r = EXIT_FAILURE, q;

         pid_t pid;

         siginfo_t status;

-        struct udev *udev = NULL;

-        struct udev_device *udev_device = NULL;

+        _cleanup_udev_unref_ struct udev *udev = NULL;

+        _cleanup_udev_device_unref_ struct udev_device *udev_device = NULL;

         const char *device;

         bool root_directory;

         int progress_pipe[2] = { -1, -1 };

@@ -400,12 +401,6 @@ int main(int argc, char *argv[]) {

                 touch("/run/systemd/quotacheck");

 finish:

-        if (udev_device)

-                udev_device_unref(udev_device);

-

-        if (udev)

-                udev_unref(udev);

-

         close_pipe(progress_pipe);

         return r;

diff --git a/src/gpt-auto-generator/gpt-auto-generator.c b/src/gpt-auto-generator/gpt-auto-generator.c

index adbf71d..8436d26 100644

--- a/src/gpt-auto-generator/gpt-auto-generator.c

+++ b/src/gpt-auto-generator/gpt-auto-generator.c

@@ -36,6 +36,7 @@

 #include "missing.h"

 #include "sd-id128.h"

 #include "libudev.h"

+#include "udev-util.h"

 #include "special.h"

 #include "unit-name.h"

 #include "virt.h"

@@ -50,10 +51,7 @@

 static const char *arg_dest = "/tmp";

-static inline void blkid_free_probep(blkid_probe *b) {

-        if (*b)

-                blkid_free_probe(*b);

-}

+define_trivial_cleanup_func(blkid_probe, blkid_free_probe)

 #define _cleanup_blkid_freep_probe_ _cleanup_(blkid_free_probep)

 static int verify_gpt_partition(const char *node, sd_id128_t *type, unsigned *nr, char **fstype) {

@@ -236,75 +234,62 @@ static int add_home(const char *path, const char *fstype) {

 }

 static int enumerate_partitions(struct udev *udev, dev_t dev) {

-        struct udev_enumerate *e = NULL;

-        struct udev_device *parent = NULL, *d = NULL;

+        struct udev_device *parent = NULL;

+        _cleanup_udev_enumerate_unref_ struct udev_enumerate *e = NULL;

+        _cleanup_udev_device_unref_ struct udev_device *d = NULL;

         struct udev_list_entry *first, *item;

         unsigned home_nr = (unsigned) -1;

         _cleanup_free_ char *home = NULL, *home_fstype = NULL;

         int r;

         e = udev_enumerate_new(udev);

-        if (!e) {

-                r = log_oom();

-                goto finish;

-        }

+        if (!e)

+                return log_oom();

         d = udev_device_new_from_devnum(udev, 'b', dev);

-        if (!d) {

-                r = log_oom();

-                goto finish;

-        }

+        if (!d)

+                return log_oom();

         parent = udev_device_get_parent(d);

-        if (!parent) {

-                r = log_oom();

-                goto finish;

-        }

+        if (!parent)

+                return log_oom();

         r = udev_enumerate_add_match_parent(e, parent);

-        if (r < 0) {

-                r = log_oom();

-                goto finish;

-        }

+        if (r < 0)

+                return log_oom();

         r = udev_enumerate_add_match_subsystem(e, "block");

-        if (r < 0) {

-                r = log_oom();

-                goto finish;

-        }

+        if (r < 0)

+                return log_oom();

         r = udev_enumerate_scan_devices(e);

         if (r < 0) {

                 log_error("Failed to enumerate partitions on /dev/block/%u:%u: %s",

                           major(dev), minor(dev), strerror(-r));

-                goto finish;

+                return r;

         }

         first = udev_enumerate_get_list_entry(e);

         udev_list_entry_foreach(item, first) {

                 _cleanup_free_ char *fstype = NULL;

                 const char *node = NULL;

-                struct udev_device *q;

+                _cleanup_udev_device_unref_ struct udev_device *q;

                 sd_id128_t type_id;

                 unsigned nr;

                 q = udev_device_new_from_syspath(udev, udev_list_entry_get_name(item));

-                if (!q) {

-                        r = log_oom();

-                        goto finish;

-                }

+                if (!q)

+                        return log_oom();

                 if (udev_device_get_devnum(q) == udev_device_get_devnum(d))

-                        goto skip;

+                        continue;

                 if (udev_device_get_devnum(q) == udev_device_get_devnum(parent))

-                        goto skip;

+                        continue;

                 node = udev_device_get_devnode(q);

-                if (!node) {

-                        r = log_oom();

-                        goto finish;

-                }

+                if (!node)

+                        return log_oom();

                 r = verify_gpt_partition(node, &type_id, &nr, &fstype);

                 if (r < 0) {

@@ -313,11 +298,10 @@ static int enumerate_partitions(struct udev *udev, dev_t dev) {

                                 continue;

                         log_error("Failed to verify GPT partition %s: %s",

                                   node, strerror(-r));

-                        udev_device_unref(q);

-                        goto finish;

+                        return r;

                 }

                 if (r == 0)

-                        goto skip;

+                        continue;

                 if (sd_id128_equal(type_id, SD_ID128_MAKE(06,57,fd,6d,a4,ab,43,c4,84,e5,09,33,c8,4b,4f,4f)))

                         add_swap(node, fstype);

@@ -326,10 +310,8 @@ static int enumerate_partitions(struct udev *udev, dev_t dev) {

                         if (!home || nr < home_nr) {

                                 free(home);

                                 home = strdup(node);

-                                if (!home) {

-                                        r = log_oom();

-                                        goto finish;

-                                }

+                                if (!home)

+                                        return log_oom();

                                 home_nr = nr;

@@ -338,22 +320,11 @@ static int enumerate_partitions(struct udev *udev, dev_t dev) {

                                 fstype = NULL;

                         }

                 }

-

-        skip:

-                udev_device_unref(q);

         }

         if (home && home_fstype)

                 add_home(home, home_fstype);

-finish:

-        if (d)

-                udev_device_unref(d);

-

-        if (e)

-                udev_enumerate_unref(e);

-

-

         return r;

 }

@@ -432,44 +403,31 @@ static int get_block_device(const char *path, dev_t *dev) {

 }

 static int devno_to_devnode(struct udev *udev, dev_t devno, char **ret) {

-        struct udev_device *d = NULL;

+        _cleanup_udev_device_unref_ struct udev_device *d;

         const char *t;

         char *n;

-        int r;

         d = udev_device_new_from_devnum(udev, 'b', devno);

-        if (!d) {

-                r = log_oom();

-                goto finish;

-        }

+        if (!d)

+                return log_oom();

         t = udev_device_get_devnode(d);

-        if (!t) {

-                r = -ENODEV;

-                goto finish;