shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2025-01-12 13:18:14 +03:00
Code

Merge pull request #118 from haraldh/set_consume2

Browse Source 
util:bind_remount_recursive() fix "use after free" - 2
This commit is contained in:
Lennart Poettering 2015-06-09 11:04:41 +02:00
commit 4b955cb9bc
1 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/shared/util.c
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 || r == 0)
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);
}
}
}