X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fshared%2Fmemfd.c;h=6e2319d6eed5f9262598780af4cad81d64703c57;hb=4531a9bc206c0c22e29b56ac4a7528afba2e9c83;hp=4dd70a2473de64a3c7bd121a41a6efdb57d4c1fe;hpb=43bde981ccc57c744f164a9d95d46c7ce8f21808;p=elogind.git

diff --git a/src/shared/memfd.c b/src/shared/memfd.c
index 4dd70a247..6e2319d6e 100644
--- a/src/shared/memfd.c
+++ b/src/shared/memfd.c
@@ -30,24 +30,12 @@
 #include "missing.h"
 #include "memfd.h"
 
-#include "sd-bus.h"
+int memfd_new(const char *name) {
 
-struct sd_memfd {
-        int fd;
-        FILE *f;
-};
-
-int sd_memfd_new(sd_memfd **m, const char *name) {
-
-        _cleanup_close_ int kdbus = -1;
         _cleanup_free_ char *g = NULL;
-        sd_memfd *n;
-
-        assert_return(m, -EINVAL);
+        int fd;
 
-        kdbus = open("/dev/kdbus/control", O_RDWR|O_NOCTTY|O_CLOEXEC);
-        if (kdbus < 0)
-                return -errno;
+        assert(name);
 
         if (name) {
                 /* The kernel side is pretty picky about the character
@@ -86,97 +74,30 @@ int sd_memfd_new(sd_memfd **m, const char *name) {
                 }
         }
 
-        n = new0(struct sd_memfd, 1);
-        if (!n)
-                return -ENOMEM;
-
-        n->fd = memfd_create(name, 0, MFD_ALLOW_SEALING);
-        if (n->fd < 0) {
-                free(n);
-                return -errno;
-        }
-
-        *m = n;
-        return 0;
-}
-
-int sd_memfd_new_from_fd(sd_memfd **m, int fd) {
-        sd_memfd *n;
-
-        assert_return(m, -EINVAL);
-        assert_return(fd >= 0, -EINVAL);
-
-        /* Check if this is a sealable fd */
-        if (fcntl(fd, F_GET_SEALS) < 0)
-                return -ENOTTY;
-
-        n = new0(struct sd_memfd, 1);
-        if (!n)
-                return -ENOMEM;
-
-        n->fd = fd;
-        *m = n;
-
-        return 0;
-}
-
-void sd_memfd_free(sd_memfd *m) {
-        if (!m)
-                return;
-
-        if (m->f)
-                fclose(m->f);
-        else
-                safe_close(m->fd);
-
-        free(m);
-}
-
-int sd_memfd_get_fd(sd_memfd *m) {
-        assert_return(m, -EINVAL);
-
-        return m->fd;
-}
-
-int sd_memfd_get_file(sd_memfd *m, FILE **f) {
-        assert_return(m, -EINVAL);
-        assert_return(f, -EINVAL);
-
-        if (!m->f) {
-                m->f = fdopen(m->fd, "r+");
-                if (!m->f)
-                        return -errno;
-        }
-
-        *f = m->f;
-        return 0;
-}
-
-int sd_memfd_dup_fd(sd_memfd *m) {
-        int fd;
-
-        assert_return(m, -EINVAL);
-
-        fd = fcntl(m->fd, F_DUPFD_CLOEXEC, 3);
+        fd = memfd_create(name, MFD_ALLOW_SEALING);
         if (fd < 0)
                 return -errno;
 
         return fd;
 }
 
-int sd_memfd_map(sd_memfd *m, uint64_t offset, size_t size, void **p) {
+int memfd_map(int fd, uint64_t offset, size_t size, void **p) {
         void *q;
         int sealed;
 
-        assert_return(m, -EINVAL);
-        assert_return(size > 0, -EINVAL);
-        assert_return(p, -EINVAL);
+        assert(fd >= 0);
+        assert(size > 0);
+        assert(p);
 
-        sealed = sd_memfd_get_sealed(m);
+        sealed = memfd_get_sealed(fd);
         if (sealed < 0)
                 return sealed;
 
-        q = mmap(NULL, size, sealed ? PROT_READ : PROT_READ|PROT_WRITE, MAP_PRIVATE, m->fd, offset);
+        if (sealed)
+                q = mmap(NULL, size, PROT_READ, MAP_PRIVATE, fd, offset);
+        else
+                q = mmap(NULL, size, PROT_READ | PROT_WRITE, MAP_SHARED, fd, offset);
+
         if (q == MAP_FAILED)
                 return -errno;
 
@@ -184,24 +105,24 @@ int sd_memfd_map(sd_memfd *m, uint64_t offset, size_t size, void **p) {
         return 0;
 }
 
-int sd_memfd_set_sealed(sd_memfd *m) {
+int memfd_set_sealed(int fd) {
         int r;
 
-        assert_return(m, -EINVAL);
+        assert(fd >= 0);
 
-        r = fcntl(m->fd, F_ADD_SEALS, F_SEAL_SHRINK | F_SEAL_GROW | F_SEAL_WRITE);
+        r = fcntl(fd, F_ADD_SEALS, F_SEAL_SHRINK | F_SEAL_GROW | F_SEAL_WRITE);
         if (r < 0)
                 return -errno;
 
         return 0;
 }
 
-int sd_memfd_get_sealed(sd_memfd *m) {
+int memfd_get_sealed(int fd) {
         int r;
 
-        assert_return(m, -EINVAL);
+        assert(fd >= 0);
 
-        r = fcntl(m->fd, F_GET_SEALS);
+        r = fcntl(fd, F_GET_SEALS);
         if (r < 0)
                 return -errno;
 
@@ -209,14 +130,14 @@ int sd_memfd_get_sealed(sd_memfd *m) {
                     (F_SEAL_SHRINK | F_SEAL_GROW | F_SEAL_WRITE);
 }
 
-int sd_memfd_get_size(sd_memfd *m, uint64_t *sz) {
-        int r;
+int memfd_get_size(int fd, uint64_t *sz) {
         struct stat stat;
+        int r;
 
-        assert_return(m, -EINVAL);
-        assert_return(sz, -EINVAL);
+        assert(fd >= 0);
+        assert(sz);
 
-        r = fstat(m->fd, &stat);
+        r = fstat(fd, &stat);
         if (r < 0)
                 return -errno;
 
@@ -224,52 +145,54 @@ int sd_memfd_get_size(sd_memfd *m, uint64_t *sz) {
         return r;
 }
 
-int sd_memfd_set_size(sd_memfd *m, uint64_t sz) {
+int memfd_set_size(int fd, uint64_t sz) {
         int r;
 
-        assert_return(m, -EINVAL);
+        assert(fd >= 0);
 
-        r = ftruncate(m->fd, sz);
+        r = ftruncate(fd, sz);
         if (r < 0)
                 return -errno;
 
         return r;
 }
 
-int sd_memfd_new_and_map(sd_memfd **m, const char *name, size_t sz, void **p) {
-        sd_memfd *n;
+int memfd_new_and_map(const char *name, size_t sz, void **p) {
+        _cleanup_close_ int fd = -1;
         int r;
 
-        r = sd_memfd_new(&n, name);
+        assert(name);
+        assert(sz > 0);
+        assert(p);
+
+        fd = memfd_new(name);
+        if (fd < 0)
+                return fd;
+
+        r = memfd_set_size(fd, sz);
         if (r < 0)
                 return r;
 
-        r = sd_memfd_set_size(n, sz);
-        if (r < 0) {
-                sd_memfd_free(n);
+        r = memfd_map(fd, 0, sz, p);
+        if (r < 0)
                 return r;
-        }
 
-        r = sd_memfd_map(n, 0, sz, p);
-        if (r < 0) {
-                sd_memfd_free(n);
-                return r;
-        }
+        r = fd;
+        fd = -1;
 
-        *m = n;
-        return 0;
+        return r;
 }
 
-int sd_memfd_get_name(sd_memfd *m, char **name) {
+int memfd_get_name(int fd, char **name) {
         char path[sizeof("/proc/self/fd/") + DECIMAL_STR_MAX(int)], buf[FILENAME_MAX+1], *e;
         const char *delim, *end;
         _cleanup_free_ char *n = NULL;
         ssize_t k;
 
-        assert_return(m, -EINVAL);
-        assert_return(name, -EINVAL);
+        assert(fd >= 0);
+        assert(name);
 
-        sprintf(path, "/proc/self/fd/%i", m->fd);
+        sprintf(path, "/proc/self/fd/%i", fd);
 
         k = readlink(path, buf, sizeof(buf));
         if (k < 0)