浏览代码

f2fs: free meta pages if sanity check for ckpt is failed

This fixes missing freeing meta pages in the error case.

Tested-by: Eric Biggers <ebiggers@google.com>
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
Jaegeuk Kim 8 年之前
父节点
当前提交
a2125ff7dd
共有 1 个文件被更改,包括 4 次插入1 次删除
  1. 4 1
      fs/f2fs/checkpoint.c

+ 4 - 1
fs/f2fs/checkpoint.c

@@ -770,7 +770,7 @@ int get_valid_checkpoint(struct f2fs_sb_info *sbi)
 
 
 	/* Sanity checking of checkpoint */
 	/* Sanity checking of checkpoint */
 	if (sanity_check_ckpt(sbi))
 	if (sanity_check_ckpt(sbi))
-		goto fail_no_cp;
+		goto free_fail_no_cp;
 
 
 	if (cur_page == cp1)
 	if (cur_page == cp1)
 		sbi->cur_cp_pack = 1;
 		sbi->cur_cp_pack = 1;
@@ -798,6 +798,9 @@ done:
 	f2fs_put_page(cp2, 1);
 	f2fs_put_page(cp2, 1);
 	return 0;
 	return 0;
 
 
+free_fail_no_cp:
+	f2fs_put_page(cp1, 1);
+	f2fs_put_page(cp2, 1);
 fail_no_cp:
 fail_no_cp:
 	kfree(sbi->ckpt);
 	kfree(sbi->ckpt);
 	return -EINVAL;
 	return -EINVAL;