[systemd-commits] src/shared

[Daniel Mack]

 src/shared/memfd.c |   15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

New commits:
commit 8f2807bab569b27eae5459854a48cdd4dead4d2c
Author: Daniel Mack <zonque at gmail.com>
Date:   Tue Aug 19 21:09:16 2014 +0200

    memfd: reduce name escaping logic to utf-8 checks
    
    As memfds are now created by proper kernel API, and not by our functions, we
    can't rely on names being escaped/unescaped according to our current logic.
    
    Thus, the only safe way is to remove the escaping and when reading names,
    just escape names that are not properly encoded in UTF-8.
    
    Also, remove assert(name) lines from the memfd creation functions, as we
    explictly allow name to be NULL.

diff --git a/src/shared/memfd.c b/src/shared/memfd.c
index 6e2319d..e335c0c 100644
--- a/src/shared/memfd.c
+++ b/src/shared/memfd.c
@@ -29,25 +29,19 @@
 #include "bus-label.h"
 #include "missing.h"
 #include "memfd.h"
+#include "utf8.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);
+                g = utf8_escape_invalid(name);
                 if (!g)
                         return -ENOMEM;
 
                 name = g;
-
         } else {
                 char pr[17] = {};
 
@@ -62,7 +56,7 @@ int memfd_new(const char *name) {
                 else {
                         _cleanup_free_ char *e = NULL;
 
-                        e = bus_label_escape(pr);
+                        e = utf8_escape_invalid(pr);
                         if (!e)
                                 return -ENOMEM;
 
@@ -161,7 +155,6 @@ 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);
 
@@ -221,7 +214,7 @@ int memfd_get_name(int fd, char **name) {
         if (!n)
                 return -ENOMEM;
 
-        e = bus_label_unescape(n);
+        e = utf8_escape_invalid(n);
         if (!e)
                 return -ENOMEM;