bus: return ECHILD as soon as people try to reuse a bus connection across a fork()

[elogind.git] / src / libsystemd-bus / sd-memfd.c

diff --git a/src/libsystemd-bus/sd-memfd.c b/src/libsystemd-bus/sd-memfd.c
index 51b111e8b56d15c410a61666a796d38658459877..bd14da3a70bb483869ea9ab46f5405348dd9ea2a 100644 (file)
--- a/src/libsystemd-bus/sd-memfd.c
+++ b/src/libsystemd-bus/sd-memfd.c
@@ -43,7 +43,7 @@ int sd_memfd_new(sd_memfd **m) {
                 return -EINVAL;
 
         kdbus = open("/dev/kdbus/control", O_RDWR|O_NOCTTY|O_CLOEXEC);
-        if (fd < 0)
+        if (kdbus < 0)
                 return -errno;
 
         if (ioctl(kdbus, KDBUS_CMD_MEMFD_NEW, &fd) < 0)
@@ -106,7 +106,7 @@ int sd_memfd_get_file(sd_memfd *m, FILE **f) {
         if (!f)
                 return -EINVAL;
 
-        if (!m->fd) {
+        if (!m->f) {
                 m->f = fdopen(m->fd, "r+");
                 if (!m->f)
                         return -errno;
@@ -205,3 +205,27 @@ int sd_memfd_set_size(sd_memfd *m, uint64_t sz) {
 
         return r;
 }
+
+int sd_memfd_new_and_map(sd_memfd **m, size_t sz, void **p) {
+        sd_memfd *n;
+        int r;
+
+        r = sd_memfd_new(&n);
+        if (r < 0)
+                return r;
+
+        r = sd_memfd_set_size(n, sz);
+        if (r < 0) {
+                sd_memfd_free(n);
+                return r;
+        }
+
+        r = sd_memfd_map(n, 0, sz, p);
+        if (r < 0) {
+                sd_memfd_free(n);
+                return r;
+        }
+
+        *m = n;
+        return 0;
+}