浏览代码

Btrfs: fix inode leak on kmalloc failure in tree-log.c

In tree-log.c:replay_one_name(), if memory allocation for
the name fails, ensure we iput the dir inode we got before
before we return.

Signed-off-by: Filipe David Borba Manana <fdmanana@gmail.com>
Signed-off-by: Josef Bacik <jbacik@fusionio.com>
Signed-off-by: Chris Mason <chris.mason@fusionio.com>
Filipe David Borba Manana 12 年之前
父节点
当前提交
2bac325ea8
共有 1 个文件被更改,包括 4 次插入2 次删除
  1. 4 2
      fs/btrfs/tree-log.c

+ 4 - 2
fs/btrfs/tree-log.c

@@ -1536,8 +1536,10 @@ static noinline int replay_one_name(struct btrfs_trans_handle *trans,
 
 
 	name_len = btrfs_dir_name_len(eb, di);
 	name_len = btrfs_dir_name_len(eb, di);
 	name = kmalloc(name_len, GFP_NOFS);
 	name = kmalloc(name_len, GFP_NOFS);
-	if (!name)
-		return -ENOMEM;
+	if (!name) {
+		ret = -ENOMEM;
+		goto out;
+	}
 
 
 	log_type = btrfs_dir_type(eb, di);
 	log_type = btrfs_dir_type(eb, di);
 	read_extent_buffer(eb, name, (unsigned long)(di + 1),
 	read_extent_buffer(eb, name, (unsigned long)(di + 1),