2019-01-23 09:31:18

by Yue Haibing

Subject: [PATCH v3 -next] mtd: docg3: Fix a possible memory leak of mtd->name

In case DOC_CHIPID_G3, mtd->name is not freed in err handling path,
which is alloced by kasprintf(). Fix this by using devm_kasprintf().

Fixes: ae9d4934b2d7 ("mtd: docg3: add multiple floor support")
Signed-off-by: YueHaibing <[email protected]>
---
v3: use devm_kasprintf
---
drivers/mtd/devices/docg3.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/mtd/devices/docg3.c b/drivers/mtd/devices/docg3.c
index 4c94fc0..59ca4f5 100644
--- a/drivers/mtd/devices/docg3.c
+++ b/drivers/mtd/devices/docg3.c
@@ -1767,8 +1767,8 @@ static int __init doc_set_driver_info(int chip_id, struct mtd_info *mtd)

switch (chip_id) {
case DOC_CHIPID_G3:
- mtd->name = kasprintf(GFP_KERNEL, "docg3.%d",
- docg3->device_id);
+ mtd->name = devm_kasprintf(docg3->dev, GFP_KERNEL, "docg3.%d",
+ docg3->device_id);
if (!mtd->name)
return -ENOMEM;
docg3->max_block = 2047;
--
2.7.0

2019-01-23 20:56:26

by Robert Jarzmik

Subject: Re: [PATCH v3 -next] mtd: docg3: Fix a possible memory leak of mtd->name

YueHaibing <[email protected]> writes:

> In case DOC_CHIPID_G3, mtd->name is not freed in err handling path,
> which is alloced by kasprintf(). Fix this by using devm_kasprintf().
>
> Fixes: ae9d4934b2d7 ("mtd: docg3: add multiple floor support")
> Signed-off-by: YueHaibing <[email protected]>
> ---
> v3: use devm_kasprintf
> ---
> drivers/mtd/devices/docg3.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
Acked-by: Robert Jarzmik <[email protected]>

Cheers.

--
Robert

2019-01-24 15:03:46

by Boris Brezillon

Subject: Re: [PATCH v3 -next] mtd: docg3: Fix a possible memory leak of mtd->name

On Wed, 23 Jan 2019 17:28:19 +0800
YueHaibing <[email protected]> wrote:

> In case DOC_CHIPID_G3, mtd->name is not freed in err handling path,
> which is alloced by kasprintf(). Fix this by using devm_kasprintf().
>
> Fixes: ae9d4934b2d7 ("mtd: docg3: add multiple floor support")
> Signed-off-by: YueHaibing <[email protected]>
> ---
> v3: use devm_kasprintf
> ---
> drivers/mtd/devices/docg3.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/mtd/devices/docg3.c b/drivers/mtd/devices/docg3.c
> index 4c94fc0..59ca4f5 100644
> --- a/drivers/mtd/devices/docg3.c
> +++ b/drivers/mtd/devices/docg3.c
> @@ -1767,8 +1767,8 @@ static int __init doc_set_driver_info(int chip_id, struct mtd_info *mtd)
>
> switch (chip_id) {
> case DOC_CHIPID_G3:
> - mtd->name = kasprintf(GFP_KERNEL, "docg3.%d",
> - docg3->device_id);
> + mtd->name = devm_kasprintf(docg3->dev, GFP_KERNEL, "docg3.%d",
> + docg3->device_id);

You forgot to remove the kfree() in the ->remove() path.

> if (!mtd->name)
> return -ENOMEM;
> docg3->max_block = 2047;

2019-01-25 01:42:02

by Yue Haibing

Subject: Re: [PATCH v3 -next] mtd: docg3: Fix a possible memory leak of mtd->name

On 2019/1/24 23:00, Boris Brezillon wrote:
> On Wed, 23 Jan 2019 17:28:19 +0800
> YueHaibing <[email protected]> wrote:
>
>> In case DOC_CHIPID_G3, mtd->name is not freed in err handling path,
>> which is alloced by kasprintf(). Fix this by using devm_kasprintf().
>>
>> Fixes: ae9d4934b2d7 ("mtd: docg3: add multiple floor support")
>> Signed-off-by: YueHaibing <[email protected]>
>> ---
>> v3: use devm_kasprintf
>> ---
>> drivers/mtd/devices/docg3.c | 4 ++--
>> 1 file changed, 2 insertions(+), 2 deletions(-)
>>
>> diff --git a/drivers/mtd/devices/docg3.c b/drivers/mtd/devices/docg3.c
>> index 4c94fc0..59ca4f5 100644
>> --- a/drivers/mtd/devices/docg3.c
>> +++ b/drivers/mtd/devices/docg3.c
>> @@ -1767,8 +1767,8 @@ static int __init doc_set_driver_info(int chip_id, struct mtd_info *mtd)
>>
>> switch (chip_id) {
>> case DOC_CHIPID_G3:
>> - mtd->name = kasprintf(GFP_KERNEL, "docg3.%d",
>> - docg3->device_id);
>> + mtd->name = devm_kasprintf(docg3->dev, GFP_KERNEL, "docg3.%d",
>> + docg3->device_id);
>
> You forgot to remove the kfree() in the ->remove() path.

Oops..., I will fix this.

Thanks a lot!

>
>> if (!mtd->name)
>> return -ENOMEM;
>> docg3->max_block = 2047;
>
>
> .
>