Skip to contentSkip to conversation

btrfs: Fix memory leakage in the tree-log.c

PATCH Superseded Geyslan G. Bem 1 participant 1 message Oct 9, 2013 Btrfs file system

v2 of 6 Superseded Latest is v6 →

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 btrfs: Fix memory leakage in the tree-log.c

In some cases, add_inode_ref() is returning without freeing the 'name' pointer.

Added bail out to explicitly call kfree when necessary.

---
 fs/btrfs/tree-log.c | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)
fs/btrfs/tree-log.c +8 -3
index 79f057c..727d4ff 100644
@@ -1170,13 +1170,16 @@ static noinline int add_inode_ref(struct btrfs_trans_handle *trans,
 			if (!dir)
 				dir = read_one_inode(root, parent_objectid);
 			if (!dir)
-				return -ENOENT;
+			{
+				ret = -ENOENT;
+				goto bail;
+			}
 		} else {
 			ret = ref_get_fields(eb, ref_ptr, &namelen, &name,
 					     &ref_index);
 		}
 		if (ret)
-			return ret;
+			goto bail;
 
 		/* if we already have a perfect match, we're done */
 		if (!inode_in_dir(root, path, btrfs_ino(dir), btrfs_ino(inode),
@@ -1214,7 +1217,6 @@ static noinline int add_inode_ref(struct btrfs_trans_handle *trans,
 		}
 
 		ref_ptr = (unsigned long)(ref_ptr + ref_struct_size) + namelen;
-		kfree(name);
 		if (log_ref_ver) {
 			iput(dir);
 			dir = NULL;
@@ -1227,6 +1229,9 @@ out:
 	btrfs_release_path(path);
 	iput(dir);
 	iput(inode);
+bail:
+	if (name)
+		kfree(name);
 	return ret;
 }
 
Signature · 1 line
1.8.4