[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <CAGG-pUR5q4gw1_Q8spEJgpqMXk0ZyHfFMKR8G3PczHPk9L=H5g@mail.gmail.com>
Date: Wed, 9 Oct 2013 20:46:33 -0300
From: Geyslan Gregório Bem <geyslan@...il.com>
To: chris.mason@...ionio.com
Cc: linux-btrfs@...r.kernel.org, LKML <linux-kernel@...r.kernel.org>,
kernel-br <kernel-br@...glegroups.com>,
"Geyslan G. Bem" <geyslan@...il.com>, Joe Perches <joe@...ches.com>
Subject: Re: [PATCH v3] btrfs: Fix memory leakage in the tree-log.c
Please,
Analyze [PATCH v3].
Regards,
Geyslan Gregório Bem
hackingbits.com
2013/10/9 Geyslan G. Bem <geyslan@...il.com>:
> 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 <geyslan@...il.com>
> ---
> fs/btrfs/tree-log.c | 10 ++++++++--
> 1 file changed, 8 insertions(+), 2 deletions(-)
>
> diff --git a/fs/btrfs/tree-log.c b/fs/btrfs/tree-log.c
> index 79f057c..ad7cc5f 100644
> --- a/fs/btrfs/tree-log.c
> +++ b/fs/btrfs/tree-log.c
> @@ -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
>
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists