picnoir/Systemd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

mount: properly check for mounts currently in /proc/self/mountinfo

Browse source 
http://lists.freedesktop.org/archives/systemd-devel/2015-May/032059.html
This commit is contained in:
Lennart Poettering 2015-05-19 17:19:27 +02:00
parent 711e02cb47
commit 394763f63c
1 changed files with 19 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
src/core/mount.c
View file

@ -1698,7 +1698,18 @@ static int mount_dispatch_io(sd_event_source *source, int fd, uint32_t revents,
if (!mount->is_mounted) {
/* A mount point is gone */
/* A mount point is not around right now. It
* might be gone, or might never have
* existed. */
if (mount->from_proc_self_mountinfo &&
mount->parameters_proc_self_mountinfo.what) {
/* Remember that this device might just have disappeared */
if (set_ensure_allocated(&gone, &string_hash_ops) < 0 ||
set_put(gone, mount->parameters_proc_self_mountinfo.what) < 0)
log_oom(); /* we don't care too much about OOM here... */
}
mount->from_proc_self_mountinfo = false;
@ -1715,14 +1726,6 @@ static int mount_dispatch_io(sd_event_source *source, int fd, uint32_t revents,
break;
}
/* Remember that this device might just have disappeared */
if (mount->parameters_proc_self_mountinfo.what) {
if (set_ensure_allocated(&gone, &string_hash_ops) < 0 ||
set_put(gone, mount->parameters_proc_self_mountinfo.what) < 0)
log_oom(); /* we don't care too much about OOM here... */
}
} else if (mount->just_mounted || mount->just_changed) {
/* A mount point was added or changed */
@ -1750,13 +1753,15 @@ static int mount_dispatch_io(sd_event_source *source, int fd, uint32_t revents,
mount_set_state(mount, mount->state);
break;
}
}
if (mount->parameters_proc_self_mountinfo.what) {
if (mount->is_mounted &&
mount->from_proc_self_mountinfo &&
mount->parameters_proc_self_mountinfo.what) {
if (set_ensure_allocated(&around, &string_hash_ops) < 0 ||
set_put(around, mount->parameters_proc_self_mountinfo.what) < 0)
log_oom();
}
if (set_ensure_allocated(&around, &string_hash_ops) < 0 ||
set_put(around, mount->parameters_proc_self_mountinfo.what) < 0)
log_oom();
}
/* Reset the flags for later calls */