[PATCH 2/2] ARM: dma-mapping: fix leak in consistent_init

Ajeet Yadav ajeet.yadav.77 at gmail.com
Fri Feb 17 08:28:33 EST 2012


thank you for kind review, but how can I resent the patch using same mail chain

git send-email --smtp-encryption=tls --smtp-server=smtp.gmail.com
--smtp-user=ajeet.yadav.77 at gmail.com --smtp-server-port=587 --from
"Ajeet Yadav <ajeet.yadav.77 at gmail.com>" --to "Russell King
<linux at arm.linux.org.uk>" --to "Jon Medhurst <tixy at yxit.co.uk>" --to
"Nicolas Pitre <nicolas.pitre at linaro.org>" --to "Catalin Marinas
<catalin.marinas at arm.com>" --to "Sumit Bhattacharya
<sumitb at nvidia.com>" --to "linux-arm-kernel at lists.infradead.org" --to
"linux-kernel at vger.kernel.org"
0002-ARM-dma-mapping-fix-leak-in-consistent_init.patch

On Fri, Feb 17, 2012 at 6:42 PM, Russell King - ARM Linux
<linux at arm.linux.org.uk> wrote:
> On Fri, Feb 17, 2012 at 06:39:55PM +0530, Ajeet Yadav wrote:
>> Although the error in this case is unlikely, but logically
>> if error occurs then we leak memory.
>>
>> Signed-off-by: Ajeet Yadav <ajeet.yadav.77 at gmail.com>
>> ---
>>  arch/arm/mm/dma-mapping.c |   24 ++++++++++++------------
>>  1 files changed, 12 insertions(+), 12 deletions(-)
>>
>> diff --git a/arch/arm/mm/dma-mapping.c b/arch/arm/mm/dma-mapping.c
>> index 04bfa76..b8cf062 100644
>> --- a/arch/arm/mm/dma-mapping.c
>> +++ b/arch/arm/mm/dma-mapping.c
>> @@ -161,7 +161,6 @@ static struct arm_vmregion_head consistent_head = {
>>   */
>>  static int __init consistent_init(void)
>>  {
>> -     int ret = 0;
>>       pgd_t *pgd;
>>       pud_t *pud;
>>       pmd_t *pmd;
>> @@ -171,7 +170,7 @@ static int __init consistent_init(void)
>>       unsigned long num_ptes = (CONSISTENT_END - base) >> PMD_SHIFT;
>>
>>       consistent_pte = kmalloc(num_ptes * sizeof(pte_t *), GFP_KERNEL);
>> -     if (!consistent_pte) {
>> +     if (unlikely(!consistent_pte)) {
>
> Please get rid of these unlikelys.  This really isn't a performance
> critical path.



More information about the linux-arm-kernel mailing list