memfd: use _cleanup_ if applicable

[elogind.git] / src / shared / memfd.c

diff --git a/src/shared/memfd.c b/src/shared/memfd.c
index 6804b423616bf507b925ccb0676b6c9b608701f8..e246f915ca9a1cb2ca19c1bb5cbe48ff3e9e2dc9 100644 (file)
--- a/src/shared/memfd.c
+++ b/src/shared/memfd.c
@@ -176,7 +176,11 @@ int sd_memfd_map(sd_memfd *m, uint64_t offset, size_t size, void **p) {
         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, m->fd, offset);
+        else
+                q = mmap(NULL, size, PROT_READ | PROT_WRITE, MAP_SHARED, m->fd, offset);
+
         if (q == MAP_FAILED)
                 return -errno;
 
@@ -237,7 +241,7 @@ int sd_memfd_set_size(sd_memfd *m, uint64_t sz) {
 }
 
 int sd_memfd_new_and_map(sd_memfd **m, const char *name, size_t sz, void **p) {
-        sd_memfd *n;
+        _cleanup_(sd_memfd_freep) sd_memfd *n = NULL;
         int r;
 
         r = sd_memfd_new(&n, name);
@@ -245,18 +249,15 @@ int sd_memfd_new_and_map(sd_memfd **m, const char *name, size_t sz, void **p) {
                 return r;
 
         r = sd_memfd_set_size(n, sz);
-        if (r < 0) {
-                sd_memfd_free(n);
+        if (r < 0)
                 return r;
-        }
 
         r = sd_memfd_map(n, 0, sz, p);
-        if (r < 0) {
-                sd_memfd_free(n);
+        if (r < 0)
                 return r;
-        }
 
         *m = n;
+        n = NULL;
         return 0;
 }