[systemd-commits] 3 commits - Makefile.am src/journal src/libsystemd src/shared
Lennart Poettering
lennart at kemper.freedesktop.org
Thu Oct 30 10:33:57 PDT 2014
Makefile.am | 4
src/journal/journal-send.c | 11 -
src/journal/journald-native.c | 5
src/libsystemd/sd-bus/bus-kernel.c | 13 -
src/libsystemd/sd-bus/bus-message.c | 13 -
src/libsystemd/sd-bus/test-bus-zero-copy.c | 2
src/shared/memfd-util.c | 174 ++++++++++++++++++++++
src/shared/memfd-util.h | 40 +++++
src/shared/memfd.c | 221 -----------------------------
src/shared/memfd.h | 42 -----
10 files changed, 235 insertions(+), 290 deletions(-)
New commits:
commit a09abc4ae0bdc0200324eaa0416f23ff2170ec4e
Author: Lennart Poettering <lennart at poettering.net>
Date: Thu Oct 30 18:32:37 2014 +0100
memfd: rename memfd.h to memfd-util.h to avoid any confusion with any libc provided headers
diff --git a/Makefile.am b/Makefile.am
index c80d25d..69d598b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -881,8 +881,8 @@ libsystemd_shared_la_SOURCES = \
src/shared/copy.h \
src/shared/base-filesystem.c \
src/shared/base-filesystem.h \
- src/shared/memfd.c \
- src/shared/memfd.h \
+ src/shared/memfd-util.c \
+ src/shared/memfd-util.h \
src/shared/uid-range.c \
src/shared/uid-range.h \
src/shared/nss-util.h
diff --git a/src/journal/journal-send.c b/src/journal/journal-send.c
index 0ee83cd..887b957c 100644
--- a/src/journal/journal-send.c
+++ b/src/journal/journal-send.c
@@ -32,7 +32,7 @@
#include "sd-journal.h"
#include "util.h"
#include "socket-util.h"
-#include "memfd.h"
+#include "memfd-util.h"
#define SNDBUF_SIZE (8*1024*1024)
diff --git a/src/journal/journald-native.c b/src/journal/journald-native.c
index d3735ec..ace8d5c 100644
--- a/src/journal/journald-native.c
+++ b/src/journal/journald-native.c
@@ -33,7 +33,7 @@
#include "journald-console.h"
#include "journald-syslog.h"
#include "journald-wall.h"
-#include "memfd.h"
+#include "memfd-util.h"
bool valid_user_field(const char *p, size_t l, bool allow_protected) {
const char *a;
diff --git a/src/libsystemd/sd-bus/bus-message.c b/src/libsystemd/sd-bus/bus-message.c
index 0eea32b..be36d9f 100644
--- a/src/libsystemd/sd-bus/bus-message.c
+++ b/src/libsystemd/sd-bus/bus-message.c
@@ -28,7 +28,7 @@
#include "strv.h"
#include "time-util.h"
#include "cgroup-util.h"
-#include "memfd.h"
+#include "memfd-util.h"
#include "sd-bus.h"
#include "bus-message.h"
diff --git a/src/libsystemd/sd-bus/test-bus-zero-copy.c b/src/libsystemd/sd-bus/test-bus-zero-copy.c
index e3010fb..e938a48 100644
--- a/src/libsystemd/sd-bus/test-bus-zero-copy.c
+++ b/src/libsystemd/sd-bus/test-bus-zero-copy.c
@@ -24,7 +24,7 @@
#include "util.h"
#include "log.h"
-#include "memfd.h"
+#include "memfd-util.h"
#include "sd-bus.h"
#include "bus-message.h"
diff --git a/src/shared/memfd-util.c b/src/shared/memfd-util.c
new file mode 100644
index 0000000..21ecf4b
--- /dev/null
+++ b/src/shared/memfd-util.c
@@ -0,0 +1,174 @@
+/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
+
+/***
+ This file is part of systemd.
+
+ Copyright 2013 Lennart Poettering
+
+ systemd is free software; you can redistribute it and/or modify it
+ under the terms of the GNU Lesser General Public License as published by
+ the Free Software Foundation; either version 2.1 of the License, or
+ (at your option) any later version.
+
+ systemd is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public License
+ along with systemd; If not, see <http://www.gnu.org/licenses/>.
+***/
+
+#include <stdio.h>
+#include <fcntl.h>
+#include <sys/ioctl.h>
+#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 "memfd-util.h"
+#include "utf8.h"
+#include "missing.h"
+
+int memfd_new(const char *name) {
+ _cleanup_free_ char *g = NULL;
+ int fd;
+
+ if (!name) {
+ char pr[17] = {};
+
+ /* If no name is specified we generate one. We include
+ * a hint indicating our library implementation, and
+ * add the thread name to it */
+
+ assert_se(prctl(PR_GET_NAME, (unsigned long) pr) >= 0);
+
+ if (isempty(pr))
+ name = "sd";
+ else {
+ _cleanup_free_ char *e = NULL;
+
+ e = utf8_escape_invalid(pr);
+ if (!e)
+ return -ENOMEM;
+
+ g = strappend("sd-", e);
+ if (!g)
+ return -ENOMEM;
+
+ name = g;
+ }
+ }
+
+ fd = memfd_create(name, MFD_ALLOW_SEALING | MFD_CLOEXEC);
+ if (fd < 0)
+ return -errno;
+
+ return fd;
+}
+
+int memfd_map(int fd, uint64_t offset, size_t size, void **p) {
+ void *q;
+ int sealed;
+
+ assert(fd >= 0);
+ assert(size > 0);
+ assert(p);
+
+ sealed = memfd_get_sealed(fd);
+ if (sealed < 0)
+ return sealed;
+
+ 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;
+
+ *p = q;
+ return 0;
+}
+
+int memfd_set_sealed(int fd) {
+ int r;
+
+ assert(fd >= 0);
+
+ r = fcntl(fd, F_ADD_SEALS, F_SEAL_SHRINK | F_SEAL_GROW | F_SEAL_WRITE);
+ if (r < 0)
+ return -errno;
+
+ return 0;
+}
+
+int memfd_get_sealed(int fd) {
+ int r;
+
+ assert(fd >= 0);
+
+ r = fcntl(fd, F_GET_SEALS);
+ if (r < 0)
+ return -errno;
+
+ return (r & (F_SEAL_SHRINK | F_SEAL_GROW | F_SEAL_WRITE)) ==
+ (F_SEAL_SHRINK | F_SEAL_GROW | F_SEAL_WRITE);
+}
+
+int memfd_get_size(int fd, uint64_t *sz) {
+ struct stat stat;
+ int r;
+
+ assert(fd >= 0);
+ assert(sz);
+
+ r = fstat(fd, &stat);
+ if (r < 0)
+ return -errno;
+
+ *sz = stat.st_size;
+ return 0;
+}
+
+int memfd_set_size(int fd, uint64_t sz) {
+ int r;
+
+ assert(fd >= 0);
+
+ r = ftruncate(fd, sz);
+ if (r < 0)
+ return -errno;
+
+ return 0;
+}
+
+int memfd_new_and_map(const char *name, size_t sz, void **p) {
+ _cleanup_close_ int fd = -1;
+ int r;
+
+ 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 = memfd_map(fd, 0, sz, p);
+ if (r < 0)
+ return r;
+
+ r = fd;
+ fd = -1;
+
+ return r;
+}
diff --git a/src/shared/memfd-util.h b/src/shared/memfd-util.h
new file mode 100644
index 0000000..cf588fe
--- /dev/null
+++ b/src/shared/memfd-util.h
@@ -0,0 +1,40 @@
+/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
+
+#pragma once
+
+/***
+ This file is part of systemd.
+
+ Copyright 2013 Lennart Poettering
+
+ systemd is free software; you can redistribute it and/or modify it
+ under the terms of the GNU Lesser General Public License as published by
+ the Free Software Foundation; either version 2.1 of the License, or
+ (at your option) any later version.
+
+ systemd is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public License
+ along with systemd; If not, see <http://www.gnu.org/licenses/>.
+***/
+
+#include <inttypes.h>
+#include <sys/types.h>
+#include <stdio.h>
+
+#include "macro.h"
+#include "util.h"
+
+int memfd_new(const char *name);
+int memfd_new_and_map(const char *name, size_t sz, void **p);
+
+int memfd_map(int fd, uint64_t offset, size_t size, void **p);
+
+int memfd_set_sealed(int fd);
+int memfd_get_sealed(int fd);
+
+int memfd_get_size(int fd, uint64_t *sz);
+int memfd_set_size(int fd, uint64_t sz);
diff --git a/src/shared/memfd.c b/src/shared/memfd.c
deleted file mode 100644
index b558177..0000000
--- a/src/shared/memfd.c
+++ /dev/null
@@ -1,174 +0,0 @@
-/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
-
-/***
- This file is part of systemd.
-
- Copyright 2013 Lennart Poettering
-
- systemd is free software; you can redistribute it and/or modify it
- under the terms of the GNU Lesser General Public License as published by
- the Free Software Foundation; either version 2.1 of the License, or
- (at your option) any later version.
-
- systemd is distributed in the hope that it will be useful, but
- WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public License
- along with systemd; If not, see <http://www.gnu.org/licenses/>.
-***/
-
-#include <stdio.h>
-#include <fcntl.h>
-#include <sys/ioctl.h>
-#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 "memfd.h"
-#include "utf8.h"
-#include "missing.h"
-
-int memfd_new(const char *name) {
- _cleanup_free_ char *g = NULL;
- int fd;
-
- if (!name) {
- char pr[17] = {};
-
- /* If no name is specified we generate one. We include
- * a hint indicating our library implementation, and
- * add the thread name to it */
-
- assert_se(prctl(PR_GET_NAME, (unsigned long) pr) >= 0);
-
- if (isempty(pr))
- name = "sd";
- else {
- _cleanup_free_ char *e = NULL;
-
- e = utf8_escape_invalid(pr);
- if (!e)
- return -ENOMEM;
-
- g = strappend("sd-", e);
- if (!g)
- return -ENOMEM;
-
- name = g;
- }
- }
-
- fd = memfd_create(name, MFD_ALLOW_SEALING | MFD_CLOEXEC);
- if (fd < 0)
- return -errno;
-
- return fd;
-}
-
-int memfd_map(int fd, uint64_t offset, size_t size, void **p) {
- void *q;
- int sealed;
-
- assert(fd >= 0);
- assert(size > 0);
- assert(p);
-
- sealed = memfd_get_sealed(fd);
- if (sealed < 0)
- return sealed;
-
- 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;
-
- *p = q;
- return 0;
-}
-
-int memfd_set_sealed(int fd) {
- int r;
-
- assert(fd >= 0);
-
- r = fcntl(fd, F_ADD_SEALS, F_SEAL_SHRINK | F_SEAL_GROW | F_SEAL_WRITE);
- if (r < 0)
- return -errno;
-
- return 0;
-}
-
-int memfd_get_sealed(int fd) {
- int r;
-
- assert(fd >= 0);
-
- r = fcntl(fd, F_GET_SEALS);
- if (r < 0)
- return -errno;
-
- return (r & (F_SEAL_SHRINK | F_SEAL_GROW | F_SEAL_WRITE)) ==
- (F_SEAL_SHRINK | F_SEAL_GROW | F_SEAL_WRITE);
-}
-
-int memfd_get_size(int fd, uint64_t *sz) {
- struct stat stat;
- int r;
-
- assert(fd >= 0);
- assert(sz);
-
- r = fstat(fd, &stat);
- if (r < 0)
- return -errno;
-
- *sz = stat.st_size;
- return 0;
-}
-
-int memfd_set_size(int fd, uint64_t sz) {
- int r;
-
- assert(fd >= 0);
-
- r = ftruncate(fd, sz);
- if (r < 0)
- return -errno;
-
- return 0;
-}
-
-int memfd_new_and_map(const char *name, size_t sz, void **p) {
- _cleanup_close_ int fd = -1;
- int r;
-
- 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 = memfd_map(fd, 0, sz, p);
- if (r < 0)
- return r;
-
- r = fd;
- fd = -1;
-
- return r;
-}
diff --git a/src/shared/memfd.h b/src/shared/memfd.h
deleted file mode 100644
index cf588fe..0000000
--- a/src/shared/memfd.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
-
-#pragma once
-
-/***
- This file is part of systemd.
-
- Copyright 2013 Lennart Poettering
-
- systemd is free software; you can redistribute it and/or modify it
- under the terms of the GNU Lesser General Public License as published by
- the Free Software Foundation; either version 2.1 of the License, or
- (at your option) any later version.
-
- systemd is distributed in the hope that it will be useful, but
- WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public License
- along with systemd; If not, see <http://www.gnu.org/licenses/>.
-***/
-
-#include <inttypes.h>
-#include <sys/types.h>
-#include <stdio.h>
-
-#include "macro.h"
-#include "util.h"
-
-int memfd_new(const char *name);
-int memfd_new_and_map(const char *name, size_t sz, void **p);
-
-int memfd_map(int fd, uint64_t offset, size_t size, void **p);
-
-int memfd_set_sealed(int fd);
-int memfd_get_sealed(int fd);
-
-int memfd_get_size(int fd, uint64_t *sz);
-int memfd_set_size(int fd, uint64_t sz);
commit 73843b52585d42cc1a970a1c664818ece6942e9e
Author: Lennart Poettering <lennart at poettering.net>
Date: Thu Oct 30 18:28:37 2014 +0100
memfd: always use our internal utility functions where we have them
diff --git a/src/journal/journal-send.c b/src/journal/journal-send.c
index bfc404e..0ee83cd 100644
--- a/src/journal/journal-send.c
+++ b/src/journal/journal-send.c
@@ -32,6 +32,7 @@
#include "sd-journal.h"
#include "util.h"
#include "socket-util.h"
+#include "memfd.h"
#define SNDBUF_SIZE (8*1024*1024)
@@ -313,16 +314,16 @@ _public_ int sd_journal_sendv(const struct iovec *iov, int n) {
* here, since we want this to be a tmpfs, and one that is
* available from early boot on and where unprivileged users
* can create files. */
- buffer_fd = memfd_create("journal-message", MFD_ALLOW_SEALING | MFD_CLOEXEC);
+ buffer_fd = memfd_new(NULL);
if (buffer_fd < 0) {
- if (errno == ENOSYS) {
+ if (buffer_fd == -ENOSYS) {
buffer_fd = open_tmpfile("/dev/shm", O_RDWR | O_CLOEXEC);
if (buffer_fd < 0)
return buffer_fd;
seal = false;
} else
- return -errno;
+ return buffer_fd;
}
n = writev(buffer_fd, w, j);
@@ -330,9 +331,9 @@ _public_ int sd_journal_sendv(const struct iovec *iov, int n) {
return -errno;
if (seal) {
- r = fcntl(buffer_fd, F_ADD_SEALS, F_SEAL_SHRINK | F_SEAL_GROW | F_SEAL_WRITE | F_SEAL_SEAL);
+ r = memfd_set_sealed(buffer_fd);
if (r < 0)
- return -errno;
+ return r;
}
mh.msg_iov = NULL;
diff --git a/src/journal/journald-native.c b/src/journal/journald-native.c
index 6a9ae8a..d3735ec 100644
--- a/src/journal/journald-native.c
+++ b/src/journal/journald-native.c
@@ -33,6 +33,7 @@
#include "journald-console.h"
#include "journald-syslog.h"
#include "journald-wall.h"
+#include "memfd.h"
bool valid_user_field(const char *p, size_t l, bool allow_protected) {
const char *a;
@@ -319,9 +320,7 @@ void server_process_native_file(
/* If it's a memfd, check if it is sealed. If so, we can just
* use map it and use it, and do not need to copy the data
* out. */
- r = fcntl(fd, F_GET_SEALS);
- sealed = r >= 0 &&
- (r & (F_SEAL_SHRINK|F_SEAL_GROW|F_SEAL_WRITE|F_SEAL_SEAL)) == (F_SEAL_SHRINK|F_SEAL_GROW|F_SEAL_WRITE|F_SEAL_SEAL);
+ sealed = memfd_get_sealed(fd) > 0;
if (!sealed && (!ucred || ucred->uid != 0)) {
_cleanup_free_ char *sl = NULL, *k = NULL;
diff --git a/src/libsystemd/sd-bus/bus-kernel.c b/src/libsystemd/sd-bus/bus-kernel.c
index 3f8b0ab..6692d9b 100644
--- a/src/libsystemd/sd-bus/bus-kernel.c
+++ b/src/libsystemd/sd-bus/bus-kernel.c
@@ -1118,20 +1118,13 @@ int bus_kernel_pop_memfd(sd_bus *bus, void **address, size_t *mapped, size_t *al
assert_se(pthread_mutex_lock(&bus->memfd_cache_mutex) >= 0);
if (bus->n_memfd_cache <= 0) {
- _cleanup_free_ char *g = NULL;
int r;
assert_se(pthread_mutex_unlock(&bus->memfd_cache_mutex) >= 0);
- assert(bus->connection_name);
-
- g = bus_label_escape(bus->connection_name);
- if (!g)
- return -ENOMEM;
-
- r = memfd_create(g, MFD_ALLOW_SEALING|MFD_CLOEXEC);
+ r = memfd_new(bus->connection_name);
if (r < 0)
- return -errno;
+ return r;
*address = NULL;
*mapped = 0;
@@ -1188,7 +1181,7 @@ void bus_kernel_push_memfd(sd_bus *bus, int fd, void *address, size_t mapped, si
/* If overly long, let's return a bit to the OS */
if (mapped > max_mapped) {
- assert_se(ftruncate(fd, max_mapped) >= 0);
+ assert_se(memfd_set_size(fd, max_mapped) >= 0);
assert_se(munmap((uint8_t*) address + max_mapped, PAGE_ALIGN(mapped - max_mapped)) >= 0);
c->mapped = c->allocated = max_mapped;
} else {
diff --git a/src/libsystemd/sd-bus/bus-message.c b/src/libsystemd/sd-bus/bus-message.c
index 1362a60..0eea32b 100644
--- a/src/libsystemd/sd-bus/bus-message.c
+++ b/src/libsystemd/sd-bus/bus-message.c
@@ -1097,10 +1097,10 @@ static int part_make_space(
uint64_t new_allocated;
new_allocated = PAGE_ALIGN(sz > 0 ? 2 * sz : 1);
- r = ftruncate(part->memfd, new_allocated);
+ r = memfd_set_size(part->memfd, new_allocated);
if (r < 0) {
m->poisoned = true;
- return -errno;
+ return r;
}
part->allocated = new_allocated;
@@ -2820,11 +2820,12 @@ int bus_message_seal(sd_bus_message *m, uint64_t cookie, usec_t timeout) {
/* Then, sync up real memfd size */
sz = part->size;
- if (ftruncate(part->memfd, sz) < 0)
- return -errno;
+ r = memfd_set_size(part->memfd, sz);
+ if (r < 0)
+ return r;
/* Finally, try to seal */
- if (fcntl(part->memfd, F_ADD_SEALS, F_SEAL_SHRINK | F_SEAL_GROW | F_SEAL_WRITE) >= 0)
+ if (memfd_set_sealed(part->memfd) >= 0)
part->sealed = true;
}
}
commit 47f0f4eb1d79ec37dfbe6a382817c0384b106373
Author: Lennart Poettering <lennart at poettering.net>
Date: Thu Oct 30 18:28:01 2014 +0100
memfd: drop memfd_get_name() as it is unused
diff --git a/src/shared/memfd.c b/src/shared/memfd.c
index f3ce8f8..b558177 100644
--- a/src/shared/memfd.c
+++ b/src/shared/memfd.c
@@ -172,50 +172,3 @@ int memfd_new_and_map(const char *name, size_t sz, void **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 = utf8_escape_invalid(n);
- if (!e)
- return -ENOMEM;
-
- *name = e;
-
- return 0;
-}
diff --git a/src/shared/memfd.h b/src/shared/memfd.h
index 8f02b0f..cf588fe 100644
--- a/src/shared/memfd.h
+++ b/src/shared/memfd.h
@@ -38,5 +38,3 @@ int memfd_get_sealed(int fd);
int memfd_get_size(int fd, uint64_t *sz);
int memfd_set_size(int fd, uint64_t sz);
-
-int memfd_get_name(int fd, char **name);
More information about the systemd-commits
mailing list