#include <sys/mman.h>
#include <sys/prctl.h>
+#ifdef HAVE_LINUX_MEMFD_H
+# include <linux/memfd.h>
+#endif
+
#include "util.h"
#include "bus-label.h"
-#include "missing.h"
#include "memfd.h"
+#include "utf8.h"
+#include "missing.h"
int memfd_new(const char *name) {
-
_cleanup_free_ char *g = NULL;
int fd;
- assert(name);
-
- 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);
- if (!g)
- return -ENOMEM;
-
- name = g;
-
- } else {
+ if (!name) {
char pr[17] = {};
/* If no name is specified we generate one. We include
else {
_cleanup_free_ char *e = NULL;
- e = bus_label_escape(pr);
+ e = utf8_escape_invalid(pr);
if (!e)
return -ENOMEM;
}
}
- fd = memfd_create(name, MFD_ALLOW_SEALING);
+ fd = memfd_create(name, MFD_ALLOW_SEALING | MFD_CLOEXEC);
if (fd < 0)
return -errno;
return -errno;
*sz = stat.st_size;
- return r;
+ return 0;
}
int memfd_set_size(int fd, uint64_t sz) {
if (r < 0)
return -errno;
- return r;
+ return 0;
}
int memfd_new_and_map(const char *name, size_t sz, void **p) {
_cleanup_close_ int fd = -1;
int r;
- assert(name);
assert(sz > 0);
assert(p);
return r;
}
-
-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(fd >= 0);
- assert(name);
-
- sprintf(path, "/proc/self/fd/%i", fd);
-
- k = readlink(path, buf, sizeof(buf));
- if (k < 0)
- return -errno;
-
- if ((size_t) k >= sizeof(buf))
- return -E2BIG;
-
- buf[k] = 0;
-
- delim = strstr(buf, ":[");
- if (!delim)
- return -EIO;
-
- delim = strchr(delim + 2, ':');
- if (!delim)
- return -EIO;
-
- delim++;
-
- end = strchr(delim, ']');
- if (!end)
- return -EIO;
-
- n = strndup(delim, end - delim);
- if (!n)
- return -ENOMEM;
-
- e = bus_label_unescape(n);
- if (!e)
- return -ENOMEM;
-
- *name = e;
-
- return 0;
-}