SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
This reverts commit 46be6129d3.
This commit is contained in:
Harald Hoyer
2015-06-09 10:31:14 +02:00
parent fba3d902b4
commit f871aeed8b
1 changed files with 6 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/shared/util.c
+6 -11
View File
@@ -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);
}
}
}