diff options
author | Ilija Hadzic <ihadzic@research.bell-labs.com> | 2013-11-12 15:11:45 -0800 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-12-04 11:05:10 -0800 |
commit | 357d902dfb913a306d485c6433c950be28de8ec9 (patch) | |
tree | e43a859b68609bf3a45ee7d8333194ec07ade805 | |
parent | cca80f85f314e83dabfa6da2a9209e0a8615dff2 (diff) | |
download | lwn-357d902dfb913a306d485c6433c950be28de8ec9.tar.gz lwn-357d902dfb913a306d485c6433c950be28de8ec9.zip |
devpts: plug the memory leak in kill_sb
commit 66da0e1f9034140ae2f571ef96e254a25083906c upstream.
When devpts is unmounted, there may be a no-longer-used IDR tree hanging
off the superblock we are about to kill. This needs to be cleaned up
before destroying the SB.
The leak is usually not a big deal because unmounting devpts is typically
done when shutting down the whole machine. However, shutting down an LXC
container instead of a physical machine exposes the problem (the garbage
is detectable with kmemleak).
Signed-off-by: Ilija Hadzic <ihadzic@research.bell-labs.com>
Cc: Sukadev Bhattiprolu <sukadev@linux.vnet.ibm.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r-- | fs/devpts/inode.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/devpts/inode.c b/fs/devpts/inode.c index 073d30b9d1ac..a726b9f29cb7 100644 --- a/fs/devpts/inode.c +++ b/fs/devpts/inode.c @@ -498,6 +498,7 @@ static void devpts_kill_sb(struct super_block *sb) { struct pts_fs_info *fsi = DEVPTS_SB(sb); + ida_destroy(&fsi->allocated_ptys); kfree(fsi); kill_litter_super(sb); } |