aboutsummaryrefslogtreecommitdiffstats
path: root/fs/ecryptfs/main.c
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2010-03-20 22:32:26 -0400
committerAl Viro <viro@zeniv.linux.org.uk>2010-05-21 18:31:13 -0400
commitdecabd6650915a9534dad09e967115513be12b24 (patch)
tree3e4aa8ed78535f3a34b60e363e7b13efbd7ea62c /fs/ecryptfs/main.c
parent894680710d813137077ad7cb351b713f64cabbdf (diff)
fix a couple of ecryptfs leaks
First of all, get_sb_nodev() grabs anon dev minor and we never free it in ecryptfs ->kill_sb(). Moreover, on one of the failure exits in ecryptfs_get_sb() we leak things - it happens before we set ->s_root and ->put_super() won't be called in that case. Solution: kill ->put_super(), do all that stuff in ->kill_sb(). And use kill_anon_sb() instead of generic_shutdown_super() to deal with anon dev leak. Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs/ecryptfs/main.c')
-rw-r--r--fs/ecryptfs/main.c9
1 files changed, 7 insertions, 2 deletions
diff --git a/fs/ecryptfs/main.c b/fs/ecryptfs/main.c
index 760983d0f25e..36268db29ea1 100644
--- a/fs/ecryptfs/main.c
+++ b/fs/ecryptfs/main.c
@@ -633,11 +633,16 @@ out:
633 * @sb: The ecryptfs super block 633 * @sb: The ecryptfs super block
634 * 634 *
635 * Used to bring the superblock down and free the private data. 635 * Used to bring the superblock down and free the private data.
636 * Private data is free'd in ecryptfs_put_super()
637 */ 636 */
638static void ecryptfs_kill_block_super(struct super_block *sb) 637static void ecryptfs_kill_block_super(struct super_block *sb)
639{ 638{
640 generic_shutdown_super(sb); 639 struct ecryptfs_sb_info *sb_info = ecryptfs_superblock_to_private(sb);
640 kill_anon_super(sb);
641 if (!sb_info)
642 return;
643 ecryptfs_destroy_mount_crypt_stat(&sb_info->mount_crypt_stat);
644 bdi_destroy(&sb_info->bdi);
645 kmem_cache_free(ecryptfs_sb_info_cache, sb_info);
641} 646}
642 647
643static struct file_system_type ecryptfs_fs_type = { 648static struct file_system_type ecryptfs_fs_type = {