sd-bus: don't clobber return values on failure in bus_kernel_open_bus_fd()

diff --git a/src/libsystemd/sd-bus/bus-kernel.c b/src/libsystemd/sd-bus/bus-kernel.c
index aa4b4240dcd0df052047f992f9a9c3c7ffa2cf1c..6baa84c042815691f63608eedc50606840e9938e 100644 (file)
--- a/src/libsystemd/sd-bus/bus-kernel.c
+++ b/src/libsystemd/sd-bus/bus-kernel.c
@@ -1514,20 +1514,29 @@ int bus_kernel_open_bus_fd(const char *bus, char **path) {
         int fd;
         size_t len;
 
         int fd;
         size_t len;
 

+        assert(bus);
+

         len = strlen("/sys/fs/kdbus/") + DECIMAL_STR_MAX(uid_t) + 1 + strlen(bus) + strlen("/bus") + 1;
 
         if (path) {
         len = strlen("/sys/fs/kdbus/") + DECIMAL_STR_MAX(uid_t) + 1 + strlen(bus) + strlen("/bus") + 1;
 
         if (path) {

-                p = malloc(len);
+                p = new(char, len);

                 if (!p)
                         return -ENOMEM;
                 if (!p)
                         return -ENOMEM;

-                *path = p;

         } else
         } else

-                p = alloca(len);
+                p = newa(char, len);
+

         sprintf(p, "/sys/fs/kdbus/" UID_FMT "-%s/bus", getuid(), bus);
 
         fd = open(p, O_RDWR|O_NOCTTY|O_CLOEXEC);
         sprintf(p, "/sys/fs/kdbus/" UID_FMT "-%s/bus", getuid(), bus);
 
         fd = open(p, O_RDWR|O_NOCTTY|O_CLOEXEC);

-        if (fd < 0)
+        if (fd < 0) {
+                if (path)
+                        free(p);
+

                 return -errno;
                 return -errno;

+        }
+
+        if (path)
+                *path = p;

 
         return fd;
 }
 
         return fd;
 }