X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;ds=sidebyside;f=src%2Fshared%2Fmemfd.c;h=c21642f49ae9b568a6ec9b2822b9cb5ff0ee7130;hb=ea47ff669723739e62a9bce6599b0346e464c08f;hp=6a2e12196a05e8a1362d0709fb8c467ea12bdd83;hpb=302e4b4963c471baefa60b220e3e05f93a49de45;p=elogind.git diff --git a/src/shared/memfd.c b/src/shared/memfd.c index 6a2e12196..c21642f49 100644 --- a/src/shared/memfd.c +++ b/src/shared/memfd.c @@ -29,32 +29,19 @@ #include "bus-label.h" #include "missing.h" #include "memfd.h" +#include "utf8.h" -#include "sd-bus.h" - -struct sd_memfd { - int fd; - FILE *f; -}; - -int sd_memfd_new(sd_memfd **m, const char *name) { +int memfd_new(const char *name) { _cleanup_free_ char *g = NULL; - sd_memfd *n; - - assert_return(m, -EINVAL); + int fd; if (name) { - /* The kernel side is pretty picky about the character - * set here, let's do the usual bus escaping to deal - * with that. */ - - g = bus_label_escape(name); + g = utf8_escape_invalid(name); if (!g) return -ENOMEM; name = g; - } else { char pr[17] = {}; @@ -67,13 +54,7 @@ int sd_memfd_new(sd_memfd **m, const char *name) { if (isempty(pr)) name = "sd"; else { - _cleanup_free_ char *e = NULL; - - e = bus_label_escape(pr); - if (!e) - return -ENOMEM; - - g = strappend("sd-", e); + g = strappend("sd-", pr); if (!g) return -ENOMEM; @@ -81,97 +62,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, 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; @@ -179,24 +93,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; @@ -204,14 +118,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; @@ -219,52 +133,53 @@ 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(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) @@ -293,7 +208,7 @@ int sd_memfd_get_name(sd_memfd *m, char **name) { if (!n) return -ENOMEM; - e = bus_label_unescape(n); + e = utf8_escape_invalid(n); if (!e) return -ENOMEM;