leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ext4: fix unbalanced mutex unlock in error path of ext4_li_request_new

Browse Source 
Signed-off-by: Nicolas Kaiser <nikai@nikai.net>
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
This commit is contained in:
Nicolas Kaiser 2010-10-27 22:08:42 -04:00 committed by Theodore Ts'o
parent a6371b636f
commit beed5ecbaa
1 changed files with 8 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
fs/ext4/super.c
View File

@ -2902,28 +2902,26 @@ static int ext4_register_li_request(struct super_block *sb,
struct ext4_sb_info *sbi = EXT4_SB(sb); struct ext4_sb_info *sbi = EXT4_SB(sb);
struct ext4_li_request *elr; struct ext4_li_request *elr;
ext4_group_t ngroups = EXT4_SB(sb)->s_groups_count; ext4_group_t ngroups = EXT4_SB(sb)->s_groups_count;
int ret = 0; int ret;
if (sbi->s_li_request != NULL) if (sbi->s_li_request != NULL)
goto out; return 0;
if (first_not_zeroed == ngroups || if (first_not_zeroed == ngroups ||
(sb->s_flags & MS_RDONLY) || (sb->s_flags & MS_RDONLY) ||
!test_opt(sb, INIT_INODE_TABLE)) { !test_opt(sb, INIT_INODE_TABLE)) {
sbi->s_li_request = NULL; sbi->s_li_request = NULL;
goto out; return 0;
} }
if (first_not_zeroed == ngroups) { if (first_not_zeroed == ngroups) {
sbi->s_li_request = NULL; sbi->s_li_request = NULL;
goto out; return 0;
} }
elr = ext4_li_request_new(sb, first_not_zeroed); elr = ext4_li_request_new(sb, first_not_zeroed);
if (!elr) { if (!elr)
ret = -ENOMEM; return -ENOMEM;
goto out;
}
mutex_lock(&ext4_li_mtx); mutex_lock(&ext4_li_mtx);
@ -2944,14 +2942,10 @@ static int ext4_register_li_request(struct super_block *sb,
if (ret) if (ret)
goto out; goto out;
} }
mutex_unlock(&ext4_li_mtx);
out: out:
if (ret) { mutex_unlock(&ext4_li_mtx);
mutex_unlock(&ext4_li_mtx); if (ret)
kfree(elr); kfree(elr);
}
return ret; return ret;
} }