Commit e0fa621b authored by Lennart Poettering's avatar Lennart Poettering
Browse files

automount: fix segfault when shutting down

https://bugs.freedesktop.org/show_bug.cgi?id=32076
parent 76e7bc8d
......@@ -9,9 +9,6 @@ Bugs:
* somehow some /etc/fstab supplied mount params are never applied to api fs
https://bugzilla.redhat.com/show_bug.cgi?id=663108
* automount units can cause a segfault:
https://bugs.freedesktop.org/show_bug.cgi?id=32076
* bind mounts with 'fsck' fail and block for a minute:
/foo /bar none bind 1 1
(requesting fsck is wrong, but why do we block for a minute
......
......@@ -98,12 +98,21 @@ static void mount_parameters_done(MountParameters *p) {
static void mount_done(Unit *u) {
Mount *m = MOUNT(u);
Meta *other;
assert(m);
free(m->where);
m->where = NULL;
/* Try to detach us from the automount unit if there is any */
LIST_FOREACH(units_per_type, other, m->meta.manager->units_per_type[UNIT_AUTOMOUNT]) {
Automount *a = (Automount*) other;
if (a->mount == m)
a->mount = NULL;
}
mount_parameters_done(&m->parameters_etc_fstab);
mount_parameters_done(&m->parameters_proc_self_mountinfo);
mount_parameters_done(&m->parameters_fragment);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment