public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
* [f2fs-dev][PATCH 2/2] f2fs: fix to put root inode in error path of fill_super
@ 2014-07-25  4:55 Chao Yu
  2014-07-25  5:58 ` Gu Zheng
  0 siblings, 1 reply; 2+ messages in thread
From: Chao Yu @ 2014-07-25  4:55 UTC (permalink / raw)
  To: Jaegeuk Kim, Changman Lee; +Cc: linux-f2fs-devel, linux-kernel

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

Signed-off-by: Chao Yu <chao2.yu@samsung.com>
---
 fs/f2fs/super.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/fs/f2fs/super.c b/fs/f2fs/super.c
index 870fe19..34649aa 100644
--- a/fs/f2fs/super.c
+++ b/fs/f2fs/super.c
@@ -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 */
-- 
2.0.1.474.g72c7794



^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: [f2fs-dev][PATCH 2/2] f2fs: fix to put root inode in error path of fill_super
  2014-07-25  4:55 [f2fs-dev][PATCH 2/2] f2fs: fix to put root inode in error path of fill_super Chao Yu
@ 2014-07-25  5:58 ` Gu Zheng
  0 siblings, 0 replies; 2+ messages in thread
From: Gu Zheng @ 2014-07-25  5:58 UTC (permalink / raw)
  To: Chao Yu; +Cc: Jaegeuk Kim, Changman Lee, linux-f2fs-devel, linux-kernel

On 07/25/2014 12:55 PM, Chao Yu wrote:

> 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'.

> 
> Signed-off-by: Chao Yu <chao2.yu@samsung.com>

Reviewed-by: Gu Zheng <guz.fnst@cn.fujitsu.com>

> ---
>  fs/f2fs/super.c | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/fs/f2fs/super.c b/fs/f2fs/super.c
> index 870fe19..34649aa 100644
> --- a/fs/f2fs/super.c
> +++ b/fs/f2fs/super.c
> @@ -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 */



^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2014-07-25  6:11 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-07-25  4:55 [f2fs-dev][PATCH 2/2] f2fs: fix to put root inode in error path of fill_super Chao Yu
2014-07-25  5:58 ` Gu Zheng

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox