Commit c02d9d1f authored by Alexander Viro's avatar Alexander Viro Committed by Linus Torvalds

[PATCH] d_alloc_root() fixes: ext2

 - inode leak on d_alloc_root() failure
parent d9ea8b28
...@@ -563,6 +563,7 @@ static int ext2_fill_super(struct super_block *sb, void *data, int silent) ...@@ -563,6 +563,7 @@ static int ext2_fill_super(struct super_block *sb, void *data, int silent)
struct buffer_head * bh; struct buffer_head * bh;
struct ext2_sb_info * sbi; struct ext2_sb_info * sbi;
struct ext2_super_block * es; struct ext2_super_block * es;
struct inode *root;
unsigned long block, sb_block = 1; unsigned long block, sb_block = 1;
unsigned long logic_sb_block = get_sb_block(&data); unsigned long logic_sb_block = get_sb_block(&data);
unsigned long offset = 0; unsigned long offset = 0;
...@@ -815,15 +816,17 @@ static int ext2_fill_super(struct super_block *sb, void *data, int silent) ...@@ -815,15 +816,17 @@ static int ext2_fill_super(struct super_block *sb, void *data, int silent)
*/ */
sb->s_op = &ext2_sops; sb->s_op = &ext2_sops;
sb->s_export_op = &ext2_export_ops; sb->s_export_op = &ext2_export_ops;
sb->s_root = d_alloc_root(iget(sb, EXT2_ROOT_INO)); root = iget(sb, EXT2_ROOT_INO);
if (!sb->s_root || !S_ISDIR(sb->s_root->d_inode->i_mode) || sb->s_root = d_alloc_root(root);
!sb->s_root->d_inode->i_blocks || !sb->s_root->d_inode->i_size) { if (!sb->s_root) {
if (sb->s_root) { iput(root);
dput(sb->s_root); printk(KERN_ERR "EXT2-fs: get root inode failed\n");
sb->s_root = NULL; goto failed_mount2;
printk(KERN_ERR "EXT2-fs: corrupt root inode, run e2fsck\n"); }
} else if (!S_ISDIR(root->i_mode) || !root->i_blocks || !root->i_size) {
printk(KERN_ERR "EXT2-fs: get root inode failed\n"); dput(sb->s_root);
sb->s_root = NULL;
printk(KERN_ERR "EXT2-fs: corrupt root inode, run e2fsck\n");
goto failed_mount2; goto failed_mount2;
} }
if (EXT2_HAS_COMPAT_FEATURE(sb, EXT3_FEATURE_COMPAT_HAS_JOURNAL)) if (EXT2_HAS_COMPAT_FEATURE(sb, EXT3_FEATURE_COMPAT_HAS_JOURNAL))
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment