AuxXxilium/linux_dsm_epyc7002
1
0
Fork 0
mirror of https://github.com/AuxXxilium/linux_dsm_epyc7002.git synced 2024-12-05 02:36:53 +07:00
Code Issues Actions Packages Projects Releases Wiki Activity

staging: erofs: fix potential double iput in erofs_read_super()

Browse Source 
Some error cases like failing from d_make_root() will
cause double iput because d_make_root() also does iput
in its error path.

Signed-off-by: Chengguang Xu <cgxu519@gmx.com>
Reviewed-by: Chao Yu <yuchao0@huawei.com>
Reviewed-by: Gao Xiang <gaoxiang25@huawei.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Chengguang Xu 2019-01-23 14:12:25 +08:00 committed by Greg Kroah-Hartman
parent 45a50ab1d6
commit 94832d9399
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/staging/erofs/super.c
View File

@ -421,13 +421,14 @@ static int erofs_read_super(struct super_block *sb,
errln("rootino(nid %llu) is not a directory(i_mode %o)", errln("rootino(nid %llu) is not a directory(i_mode %o)",
ROOT_NID(sbi), inode->i_mode); ROOT_NID(sbi), inode->i_mode);
err = -EINVAL; err = -EINVAL;
goto err_isdir; iput(inode);
goto err_iget;
} }
sb->s_root = d_make_root(inode); sb->s_root = d_make_root(inode);
if (sb->s_root == NULL) { if (sb->s_root == NULL) {
err = -ENOMEM; err = -ENOMEM;
goto err_makeroot; goto err_iget;
} }
/* save the device name to sbi */ /* save the device name to sbi */
@ -453,10 +454,6 @@ static int erofs_read_super(struct super_block *sb,
*/ */
err_devname: err_devname:
dput(sb->s_root); dput(sb->s_root);
err_makeroot:
err_isdir:
if (sb->s_root == NULL)
iput(inode);
err_iget: err_iget:
#ifdef EROFS_FS_HAS_MANAGED_CACHE #ifdef EROFS_FS_HAS_MANAGED_CACHE
iput(sbi->managed_cache); iput(sbi->managed_cache);