From: Harald Hoyer <harald@redhat.com>
Date: Tue, 9 Jun 2015 08:31:14 +0000 (+0200)
Subject: Revert "util:bind_remount_recursive() fix "use after free""
X-Git-Tag: v221~160^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f871aeed8bc45158f9e63d06153a236eb9376fd7;p=thirdparty%2Fsystemd.git

Revert "util:bind_remount_recursive() fix "use after free""

This reverts commit 46be6129d3e52556eb0f2ae4d07818f9f3f7af7a.
---

diff --git a/src/shared/util.c b/src/shared/util.c
index 1442301cd7f..311acbb3499 100644
--- a/src/shared/util.c
+++ b/src/shared/util.c
@@ -4931,15 +4931,11 @@ int bind_remount_recursive(const char *prefix, bool ro) {
 
                 while ((x = set_steal_first(todo))) {
 
-                        r = set_put(done, x);
-                        if (r == -EEXIST) {
-                                free(x);
+                        r = set_consume(done, x);
+                        if (r == -EEXIST)
                                 continue;
-                        }
-                        if (r < 0) {
-                                free(x);
+                        if (r < 0)
                                 return r;
-                        }
 
                         /* Try to reuse the original flag set, but
                          * don't care for errors, in case of
@@ -4949,15 +4945,14 @@ int bind_remount_recursive(const char *prefix, bool ro) {
                         orig_flags &= ~MS_RDONLY;
 
                         if (mount(NULL, x, NULL, orig_flags|MS_BIND|MS_REMOUNT|(ro ? MS_RDONLY : 0), NULL) < 0) {
+
                                 /* Deal with mount points that are
                                  * obstructed by a later mount */
 
-                                if (errno != ENOENT) {
-                                        free(x);
+                                if (errno != ENOENT)
                                         return -errno;
-                                }
                         }
-                        free(x);
+
                 }
         }
 }