diff options
author | Tao Ma <boyu.mt@taobao.com> | 2011-04-04 16:00:49 -0400 |
---|---|---|
committer | Theodore Ts'o <tytso@mit.edu> | 2011-04-04 16:00:49 -0400 |
commit | 46e4690bbd9a4f8d9e7c4f34e34b48f703ad47e0 (patch) | |
tree | 94d800c75ed4a9e11cd5301e171d301b266d4032 | |
parent | 5b41395fcc0265fc9f193aef9df39ce49d64677c (diff) |
ext4: fix a double free in ext4_register_li_request
In ext4_register_li_request, we malloc a ext4_li_request and
inserts it into ext4_li_info->li_request_list. In case of any
error later, we free it in the end. But if we have some error
in ext4_run_lazyinit_thread, the whole li_request_list will be
dropped and freed in it. So we will double free this ext4_li_request.
This patch just sets elr to NULL after it is inserted to the list
so that the latter kfree won't double free it.
Signed-off-by: Tao Ma <boyu.mt@taobao.com>
Reviewed-by: Lukas Czerner <lczerner@redhat.com>
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
Cc: stable@kernel.org
-rw-r--r-- | fs/ext4/super.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/fs/ext4/super.c b/fs/ext4/super.c index 35ff9fef68bd..35bd0206bbb3 100644 --- a/fs/ext4/super.c +++ b/fs/ext4/super.c | |||
@@ -2975,6 +2975,12 @@ static int ext4_register_li_request(struct super_block *sb, | |||
2975 | mutex_unlock(&ext4_li_info->li_list_mtx); | 2975 | mutex_unlock(&ext4_li_info->li_list_mtx); |
2976 | 2976 | ||
2977 | sbi->s_li_request = elr; | 2977 | sbi->s_li_request = elr; |
2978 | /* | ||
2979 | * set elr to NULL here since it has been inserted to | ||
2980 | * the request_list and the removal and free of it is | ||
2981 | * handled by ext4_clear_request_list from now on. | ||
2982 | */ | ||
2983 | elr = NULL; | ||
2978 | 2984 | ||
2979 | if (!(ext4_li_info->li_state & EXT4_LAZYINIT_RUNNING)) { | 2985 | if (!(ext4_li_info->li_state & EXT4_LAZYINIT_RUNNING)) { |
2980 | ret = ext4_run_lazyinit_thread(); | 2986 | ret = ext4_run_lazyinit_thread(); |