diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2012-05-30 04:03:48 +0200 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2012-05-31 03:04:55 +0200 |
| commit | 63d37a84ab6004c235314ffd7a76c5eb28c2fae0 (patch) | |
| tree | c147b24bd2604b90a872cefd0569cea5ca3ecdd3 | |
| parent | pipe: return -ENOIOCTLCMD instead of -EINVAL on unknown ioctl command (diff) | |
| download | linux-63d37a84ab6004c235314ffd7a76c5eb28c2fae0.tar.xz linux-63d37a84ab6004c235314ffd7a76c5eb28c2fae0.zip | |
vfs: umount_tree() might be called on subtree that had never made it
__mnt_make_shortterm() in there undoes the effect of __mnt_make_longterm()
we'd done back when we set ->mnt_ns non-NULL; it should not be done to
vfsmounts that had never gone through commit_tree() and friends. Kudos to
lczerner for catching that one...
Cc: stable@vger.kernel.org
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
| -rw-r--r-- | fs/namespace.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/namespace.c b/fs/namespace.c index 224aff1c0dfd..1e4a5fe3d7b7 100644 --- a/fs/namespace.c +++ b/fs/namespace.c @@ -1074,8 +1074,9 @@ void umount_tree(struct mount *mnt, int propagate, struct list_head *kill) list_del_init(&p->mnt_expire); list_del_init(&p->mnt_list); __touch_mnt_namespace(p->mnt_ns); + if (p->mnt_ns) + __mnt_make_shortterm(p); p->mnt_ns = NULL; - __mnt_make_shortterm(p); list_del_init(&p->mnt_child); if (mnt_has_parent(p)) { p->mnt_parent->mnt_ghosts++; |