diff mbox series

[-next] mtd/ftl: Fix memleak in ftl_add_mtd()

Message ID 20220715071105.2321311-1-cuigaosheng1@huawei.com
State Changes Requested
Headers show
Series [-next] mtd/ftl: Fix memleak in ftl_add_mtd() | expand

Commit Message

cuigaosheng July 15, 2022, 7:11 a.m. UTC
When add_mtd_blktrans_dev failed, partition's memory will be freed
by kfree, but there are some structure members that are allocated
for memory independently, such as partition->VirtualBlockMap,
partition->EUNInfo, partition->ZferInfo, and partition->bam_cache,
so kfree(partition) may cause memory leaks, using ftl_freepart(partition)
will fix it.

Fixes: 1da177e4c3f4 ("Linux-2.6.12-rc2")
Signed-off-by: Gaosheng Cui <cuigaosheng1@huawei.com>
---
 drivers/mtd/ftl.c | 1 +
 1 file changed, 1 insertion(+)

Comments

cuigaosheng Aug. 18, 2022, 1:31 a.m. UTC | #1
PING

在 2022/7/15 15:11, Gaosheng Cui 写道:
> When add_mtd_blktrans_dev failed, partition's memory will be freed
> by kfree, but there are some structure members that are allocated
> for memory independently, such as partition->VirtualBlockMap,
> partition->EUNInfo, partition->ZferInfo, and partition->bam_cache,
> so kfree(partition) may cause memory leaks, using ftl_freepart(partition)
> will fix it.
>
> Fixes: 1da177e4c3f4 ("Linux-2.6.12-rc2")
> Signed-off-by: Gaosheng Cui <cuigaosheng1@huawei.com>
> ---
>   drivers/mtd/ftl.c | 1 +
>   1 file changed, 1 insertion(+)
>
> diff --git a/drivers/mtd/ftl.c b/drivers/mtd/ftl.c
> index f655d2905270..200271bdc7aa 100644
> --- a/drivers/mtd/ftl.c
> +++ b/drivers/mtd/ftl.c
> @@ -1031,6 +1031,7 @@ static void ftl_add_mtd(struct mtd_blktrans_ops *tr, struct mtd_info *mtd)
>   		partition->mbd.devnum = -1;
>   		if (!add_mtd_blktrans_dev(&partition->mbd))
>   			return;
> +		ftl_freepart(partition);
>   	}
>   
>   	kfree(partition);
Richard Weinberger Aug. 18, 2022, 6:59 a.m. UTC | #2
----- Ursprüngliche Mail -----
> Von: "cuigaosheng" <cuigaosheng1@huawei.com>
>
> PING

There seems to be a problem with your caps lock key. ;-)
 
> 在 2022/7/15 15:11, Gaosheng Cui 写道:
>> When add_mtd_blktrans_dev failed, partition's memory will be freed
>> by kfree, but there are some structure members that are allocated
>> for memory independently, such as partition->VirtualBlockMap,
>> partition->EUNInfo, partition->ZferInfo, and partition->bam_cache,
>> so kfree(partition) may cause memory leaks, using ftl_freepart(partition)
>> will fix it.

Is this leak observable via kmemleak or such?
I always thought ->remove_dev() unconditionally do a cleanup later.

>> Fixes: 1da177e4c3f4 ("Linux-2.6.12-rc2")
>> Signed-off-by: Gaosheng Cui <cuigaosheng1@huawei.com>
>> ---
>>   drivers/mtd/ftl.c | 1 +
>>   1 file changed, 1 insertion(+)
>>
>> diff --git a/drivers/mtd/ftl.c b/drivers/mtd/ftl.c
>> index f655d2905270..200271bdc7aa 100644
>> --- a/drivers/mtd/ftl.c
>> +++ b/drivers/mtd/ftl.c
>> @@ -1031,6 +1031,7 @@ static void ftl_add_mtd(struct mtd_blktrans_ops *tr,
>> struct mtd_info *mtd)
>>   		partition->mbd.devnum = -1;
>>   		if (!add_mtd_blktrans_dev(&partition->mbd))
>>   			return;
>> +		ftl_freepart(partition);
>>   	}
>>   
> >   	kfree(partition);
cuigaosheng Aug. 19, 2022, 2:37 a.m. UTC | #3
> There seems to be a problem with your caps lock key. ;-)

I wil adjust my caps lock key, Thanks for reminding.

> Is this leak observable via kmemleak or such?
> I always thought ->remove_dev() unconditionally do a cleanup later.

When I'm working on other issues with mtd,I needed to analyze the mtd driver
initialization process,during reading the code, refer to other driver
implementation,I found this problem, not kmemleak. Thanks.

在 2022/8/18 14:59, Richard Weinberger 写道:
> ----- Ursprüngliche Mail -----
>> Von: "cuigaosheng" <cuigaosheng1@huawei.com>
>>
>> PING
> There seems to be a problem with your caps lock key. ;-)
>   
>> 在 2022/7/15 15:11, Gaosheng Cui 写道:
>>> When add_mtd_blktrans_dev failed, partition's memory will be freed
>>> by kfree, but there are some structure members that are allocated
>>> for memory independently, such as partition->VirtualBlockMap,
>>> partition->EUNInfo, partition->ZferInfo, and partition->bam_cache,
>>> so kfree(partition) may cause memory leaks, using ftl_freepart(partition)
>>> will fix it.
> Is this leak observable via kmemleak or such?
> I always thought ->remove_dev() unconditionally do a cleanup later.
>
>>> Fixes: 1da177e4c3f4 ("Linux-2.6.12-rc2")
>>> Signed-off-by: Gaosheng Cui <cuigaosheng1@huawei.com>
>>> ---
>>>    drivers/mtd/ftl.c | 1 +
>>>    1 file changed, 1 insertion(+)
>>>
>>> diff --git a/drivers/mtd/ftl.c b/drivers/mtd/ftl.c
>>> index f655d2905270..200271bdc7aa 100644
>>> --- a/drivers/mtd/ftl.c
>>> +++ b/drivers/mtd/ftl.c
>>> @@ -1031,6 +1031,7 @@ static void ftl_add_mtd(struct mtd_blktrans_ops *tr,
>>> struct mtd_info *mtd)
>>>    		partition->mbd.devnum = -1;
>>>    		if (!add_mtd_blktrans_dev(&partition->mbd))
>>>    			return;
>>> +		ftl_freepart(partition);
>>>    	}
>>>    
>>>    	kfree(partition);
> .
diff mbox series

Patch

diff --git a/drivers/mtd/ftl.c b/drivers/mtd/ftl.c
index f655d2905270..200271bdc7aa 100644
--- a/drivers/mtd/ftl.c
+++ b/drivers/mtd/ftl.c
@@ -1031,6 +1031,7 @@  static void ftl_add_mtd(struct mtd_blktrans_ops *tr, struct mtd_info *mtd)
 		partition->mbd.devnum = -1;
 		if (!add_mtd_blktrans_dev(&partition->mbd))
 			return;
+		ftl_freepart(partition);
 	}
 
 	kfree(partition);