diff options
author | Vasily Averin <vvs@parallels.com> | 2014-07-21 12:30:23 +0400 |
---|---|---|
committer | Jiri Slaby <jslaby@suse.cz> | 2014-07-30 18:02:41 +0200 |
commit | 37b0ade4c681de6e0d7762c948c400496bc1b27b (patch) | |
tree | 5f322c63008d5e409ee806a232711e71153427e9 | |
parent | dd816b4516f2e50653a43eceb92ca6bb4f562629 (diff) |
fs: umount on symlink leaks mnt count
commit 295dc39d941dc2ae53d5c170365af4c9d5c16212 upstream.
Currently umount on symlink blocks following umount:
/vz is separate mount
# ls /vz/ -al | grep test
drwxr-xr-x. 2 root root 4096 Jul 19 01:14 testdir
lrwxrwxrwx. 1 root root 11 Jul 19 01:16 testlink -> /vz/testdir
# umount -l /vz/testlink
umount: /vz/testlink: not mounted (expected)
# lsof /vz
# umount /vz
umount: /vz: device is busy. (unexpected)
In this case mountpoint_last() gets an extra refcount on path->mnt
Signed-off-by: Vasily Averin <vvs@openvz.org>
Acked-by: Ian Kent <raven@themaw.net>
Acked-by: Jeff Layton <jlayton@primarydata.com>
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
-rw-r--r-- | fs/namei.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/namei.c b/fs/namei.c index 338d08b7eae2..e3249d565c95 100644 --- a/fs/namei.c +++ b/fs/namei.c @@ -2281,9 +2281,10 @@ done: goto out; } path->dentry = dentry; - path->mnt = mntget(nd->path.mnt); + path->mnt = nd->path.mnt; if (should_follow_link(dentry->d_inode, nd->flags & LOOKUP_FOLLOW)) return 1; + mntget(path->mnt); follow_mount(path); error = 0; out: |