Re: [Kernel-BR] [PATCH] btrfs: Fix memory leakage in the tree-log.c

[Geyslan GregÃrio Bem]

Felipe, thank you,

Sending v2.

Geyslan GregÃrio Bem
hackingbits.com


2013/10/9 Felipe Pena <felipensp@xxxxxxxxx>:
> Hi,
>
> On Wed, Oct 9, 2013 at 8:13 PM, Geyslan G. Bem <geyslan@xxxxxxxxx> wrote:
>> 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@xxxxxxxxx>
>> ---
>>  fs/btrfs/tree-log.c | 13 ++++++++++---
>>  1 file changed, 10 insertions(+), 3 deletions(-)
>>
>> diff --git a/fs/btrfs/tree-log.c b/fs/btrfs/tree-log.c
>> index 79f057c..37d32c3 100644
>> --- a/fs/btrfs/tree-log.c
>> +++ b/fs/btrfs/tree-log.c
>> @@ -1170,13 +1170,18 @@ 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;
>> +                       }
>
> No braces required here.
>
>
>>                 } else {
>>                         ret = ref_get_fields(eb, ref_ptr, &namelen, &name,
>>                                              &ref_index);
>>                 }
>>                 if (ret)
>> -                       return ret;
>> +               {
>> +                       goto bail;
>> +               }
>>
>
> Ditto.
>
>>                 /* if we already have a perfect match, we're done */
>>                 if (!inode_in_dir(root, path, btrfs_ino(dir), btrfs_ino(inode),
>> @@ -1214,7 +1219,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 +1231,9 @@ out:
>>         btrfs_release_path(path);
>>         iput(dir);
>>         iput(inode);
>> +bail:
>> +       if (name)
>> +               kfree(name);
>>         return ret;
>>  }
>>
>> --
>> 1.8.4
>>
>> --
>> Vocà està recebendo esta mensagem porque se inscreveu no grupo "Kernel Brasil" dos Grupos do Google.
>> Para cancelar a inscriÃÃo neste grupo e parar de receber seus e-mails, envie um e-mail para kernel-br+unsubscribe@xxxxxxxxxxxxxxxxx
>> Para postar neste grupo, envie um e-mail para kernel-br@xxxxxxxxxxxxxxxxx
>> Para ver esta discussÃo na web, acesse https://groups.google.com/d/msgid/kernel-br/1381360387-27535-1-git-send-email-geyslan%40gmail.com.
>> Para obter mais opÃÃes, acesse https://groups.google.com/groups/opt_out.
>
>
>
> --
> Regards,
> Felipe Pena
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/