Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Message-ID: <c6ae7eda-0792-2ac0-e524-eb000366b50f@huawei.com>
Date:   Tue, 24 May 2022 11:15:44 +0800
MIME-Version: 1.0
User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:91.0) Gecko/20100101
 Thunderbird/91.5.1
Subject: Re: [PATCH] amba: fix refcount underflow if amba_device_add() fails
Content-Language: en-US
To:     Guenter Roeck <linux@roeck-us.net>
CC:     <linux@armlinux.org.uk>, <linux-kernel@vger.kernel.org>,
        <linux-arm-kernel@lists.infradead.org>, <robh@kernel.org>
References: <20220524030941.GA290608@roeck-us.net>
From:   Kefeng Wang <wangkefeng.wang@huawei.com>
In-Reply-To: <20220524030941.GA290608@roeck-us.net>
Content-Type: text/plain; charset="UTF-8"; format=flowed
Content-Transfer-Encoding: 7bit
Precedence: bulk


On 2022/5/24 11:09, Guenter Roeck wrote:
> On Tue, May 24, 2022 at 10:51:39AM +0800, Kefeng Wang wrote:
>> "ARM: 9192/1: amba: fix memory leak in amba_device_try_add()" leads
>> to a refcount underflow if amba_device_add() fails, which called by
>> of_amba_device_create(), the of_amba_device_create() already exists
>> the error handling, so amba_put_device() only need to be added into
>> amba_deferred_retry().
>>
>> Reported-by: Guenter Roeck <linux@roeck-us.net>
>> Signed-off-by: Kefeng Wang <wangkefeng.wang@huawei.com>
> Tested-by: Guenter Roeck <linux@roeck-us.net>

Thanks.

PS: I also test with kmemleak, this could also fix previous memory leak 
issue.

>
> Thanks,
> Guenter
>
>> ---
>>   drivers/amba/bus.c | 8 ++------
>>   1 file changed, 2 insertions(+), 6 deletions(-)
>>
>> diff --git a/drivers/amba/bus.c b/drivers/amba/bus.c
>> index 0e3ed5eb367b..0cb20324da16 100644
>> --- a/drivers/amba/bus.c
>> +++ b/drivers/amba/bus.c
>> @@ -493,13 +493,8 @@ static int amba_device_try_add(struct amba_device *dev, struct resource *parent)
>>   		goto skip_probe;
>>   
>>   	ret = amba_read_periphid(dev);
>> -	if (ret) {
>> -		if (ret != -EPROBE_DEFER) {
>> -			amba_device_put(dev);
>> -			goto err_out;
>> -		}
>> +	if (ret)
>>   		goto err_release;
>> -	}
>>   
>>   skip_probe:
>>   	ret = device_add(&dev->dev);
>> @@ -546,6 +541,7 @@ static int amba_deferred_retry(void)
>>   			continue;
>>   
>>   		list_del_init(&ddev->node);
>> +		amba_device_put(ddev->dev);
>>   		kfree(ddev);
>>   	}
>>   
>> -- 
>> 2.35.3
>>
> .