btrfs: Fix memory leakage in the tree-log.c
PATCH v3 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 | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-)
fs/btrfs/tree-log.c +8 -2
@@ -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),
@@ -1227,6 +1230,9 @@ out:btrfs_release_path (path);iput (dir);iput (inode); +bail: +if (name) +kfree (name);return ret; }
Signature · 1 line
1.8.4
Please,
Analyze [PATCH v3].
Regards,
Geyslan Gregório Bem
hackingbits.com
2013/10/9 Geyslan G. Bem <[email protected]>:
Quoted 46 lines
In some cases,
add_inode_ref()is returning without freeing the 'name' pointer.Added bail out to explicitly call kfree when necessary.
Signed-off-by Geyslan G. Bem <[email protected]>--- fs/btrfs/tree-log.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-)fs/btrfs/tree-log.c +8
-3@@ -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),@@ -1227,6 +1230,9 @@ out:btrfs_release_path (path);iput (dir);iput (inode); +bail: +if (name) +kfree (name);return ret; } --1.8.4
Quoted 15 lines · Geyslan G. Bem
In some cases,
add_inode_ref()is returning without freeing the 'name' pointer.Added bail out to explicitly call kfree when necessary.
Signed-off-by Geyslan G. Bem <[email protected]>--- fs/btrfs/tree-log.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-)fs/btrfs/tree-log.c +0
-0
fs/btrfs/tree-log.c static noinline int add_inode_ref(struct btrfs_trans_handle *trans, · line 1176
Quoted 8 lines
fs/btrfs/tree-log.c +4
-1@@ -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; + }
Code formatting is
if () {
}
not
if ()
{
}
Quoted 11 lines
fs/btrfs/tree-log.c +1
-1} 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),
fs/btrfs/tree-log.c out: · line 1235
Quoted 6 lines
fs/btrfs/tree-log.c +3
-0@@ -1227,6 +1230,9 @@ out:btrfs_release_path (path);iput (dir);iput (inode); +bail: +if (name) +kfree (name);
kfree already does the if (name) part of this so this is redundant. Also if you are going to do this you need to set name = NULL; after the kfree above it otherwise we have a double free. Thanks,
Josef
Josef,
Thank you. Sending v4.
Geyslan Gregório Bem
hackingbits.com
2013/10/9 Josef Bacik <[email protected]>:
Quoted 60 lines · Geyslan G. Bem
Quoted 15 lines
In some cases,
add_inode_ref()is returning without freeing the 'name' pointer.Added bail out to explicitly call kfree when necessary.
Signed-off-by Geyslan G. Bem <[email protected]>--- fs/btrfs/tree-log.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-)fs/btrfs/tree-log.c +0
-0fs/btrfs/tree-log.c static noinline int add_inode_ref(struct btrfs_trans_handle *trans, · line 1176
Quoted 8 lines
fs/btrfs/tree-log.c +4
-1@@ -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; + }Code formatting is
if () {
}not
if ()
{
}Quoted 11 lines
fs/btrfs/tree-log.c +1
-1} 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),fs/btrfs/tree-log.c out: · line 1235
Quoted 6 lines
fs/btrfs/tree-log.c +3
-0@@ -1227,6 +1230,9 @@ out:btrfs_release_path (path);iput (dir);iput (inode); +bail: +if (name) +kfree (name);kfree already does the if (name) part of this so this is redundant. Also if you are going to do this you need to set name = NULL; after the kfree above it otherwise we have a double free. Thanks,
Josef