diff options
| author | Ilija Hadzic <ihadzic@research.bell-labs.com> | 2013-11-12 15:11:45 -0800 |
|---|---|---|
| committer | Ben Hutchings <ben@decadent.org.uk> | 2014-01-03 04:33:21 +0000 |
| commit | 5967d03f7124b03aaa32bc24f72f32dd54226d41 (patch) | |
| tree | eaa46c2db1cf0eb24fdf7e81cb1d5eb2cf7fe8f0 /fs | |
| parent | 983e0bc2210a853af015841de33a06abd873a4fe (diff) | |
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: Ben Hutchings <ben@decadent.org.uk>
Diffstat (limited to 'fs')
| -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 d5d5297efe9..2a950478a9c 100644 --- a/fs/devpts/inode.c +++ b/fs/devpts/inode.c @@ -413,6 +413,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); } |