summaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorIlija Hadzic <ihadzic@research.bell-labs.com>2013-11-12 15:11:45 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2013-11-13 12:09:36 +0900
commit66da0e1f9034140ae2f571ef96e254a25083906c (patch)
tree46becb19a1991f0ed0ec2fb4d42ba69aebe79ac8 /fs
parent1bf49dd4be0b000030c6f04c4a16a17d9affdbd3 (diff)
downloadlinux-66da0e1f9034140ae2f571ef96e254a25083906c.tar.gz
linux-66da0e1f9034140ae2f571ef96e254a25083906c.tar.bz2
linux-66da0e1f9034140ae2f571ef96e254a25083906c.zip
devpts: plug the memory leak in kill_sb
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> Cc: <stable@vger.kernel.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'fs')
-rw-r--r--fs/devpts/inode.c1
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);
}