Skip to contentSkip to conversation

f2fs: fix to put root inode in error path of fill_super

PATCH In review Chao Yu 2 participants 2 messages Jul 25, 2014 F2FS file system

lore
Share & tools
lore

Chao Yu

author
#0 lore raw

PATCH 2/2 f2fs: fix to put root inode in error path of fill_super

We should put root inode correctly in error path of fill_super, otherwise we may encounter a leak case of inode resource.

---
 fs/f2fs/super.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
fs/f2fs/super.c +2 -1
index 870fe19..34649aa 100644
@@ -1033,8 +1033,9 @@ static int f2fs_fill_super(struct super_block *sb, void *data, int silent)
 		goto free_node_inode;
 	}
 	if (!S_ISDIR(root->i_mode) || !root->i_blocks || !root->i_size) {
+		iput(root);
 		err = -EINVAL;
-		goto free_root_inode;
+		goto free_node_inode;
 	}
 
 	sb->s_root = d_make_root(root); /* allocate root dentry */
Signature · 1 line
2.0.1.474.g72c7794
Reviewed-by on v1 2/2
#1 lore raw
Quoted 2 lines · Chao Yu

We should put root inode correctly in error path of fill_super, otherwise we may encounter a leak case of inode resource.

Good catch, and it also fixed the incorrect 'goto'.

Quoted 2 lines
Quoted 19 lines
---
 fs/f2fs/super.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
fs/f2fs/super.c +2 -1
index 870fe19..34649aa 100644
@@ -1033,8 +1033,9 @@ static int f2fs_fill_super(struct super_block *sb, void *data, int silent)
 		goto free_node_inode;
 	}
 	if (!S_ISDIR(root->i_mode) || !root->i_blocks || !root->i_size) {
+		iput(root);
 		err = -EINVAL;
-		goto free_root_inode;
+		goto free_node_inode;
 	}
 
 	sb->s_root = d_make_root(root); /* allocate root dentry */