2018-11-16 11:04:15

by Yue Haibing

[permalink] [raw]
Subject: [PATCH -next] video: fbdev: pxafb: Fix "WARNING: invalid free of devm_ allocated data"

'info->modes' got allocated with devm_kcalloc in of_get_pxafb_display.

This gives this error message:
./drivers/video/fbdev/pxafb.c:2238:2-7: WARNING: invalid free of devm_ allocated data

Signed-off-by: YueHaibing <[email protected]>
---
drivers/video/fbdev/pxafb.c | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/drivers/video/fbdev/pxafb.c b/drivers/video/fbdev/pxafb.c
index bbed039..d59c8a5 100644
--- a/drivers/video/fbdev/pxafb.c
+++ b/drivers/video/fbdev/pxafb.c
@@ -2234,10 +2234,8 @@ static struct pxafb_mach_info *of_pxafb_of_mach_info(struct device *dev)
if (!info)
return ERR_PTR(-ENOMEM);
ret = of_get_pxafb_mode_info(dev, info);
- if (ret) {
- kfree(info->modes);
+ if (ret)
return ERR_PTR(ret);
- }

/*
* On purpose, neither lccrX registers nor video memory size can be
--
2.7.0




2018-11-16 20:06:27

by Daniel Mack

[permalink] [raw]
Subject: Re: [PATCH -next] video: fbdev: pxafb: Fix "WARNING: invalid free of devm_ allocated data"

On 16/11/2018 12:02 PM, YueHaibing wrote:
> 'info->modes' got allocated with devm_kcalloc in of_get_pxafb_display.
>
> This gives this error message:
> ./drivers/video/fbdev/pxafb.c:2238:2-7: WARNING: invalid free of devm_ allocated data
>
> Signed-off-by: YueHaibing <[email protected]>

Oh, yes. Thanks for spotting this!

Could you please add these lines to the patch and resubmit?


Fixes: c8f96304ec8b4 ("video: fbdev: pxafb: switch to devm_* API")
Cc: [email protected] [v4.19+]
Reviewed-by: Daniel Mack <[email protected]>




> ---
> drivers/video/fbdev/pxafb.c | 4 +---
> 1 file changed, 1 insertion(+), 3 deletions(-)
>
> diff --git a/drivers/video/fbdev/pxafb.c b/drivers/video/fbdev/pxafb.c
> index bbed039..d59c8a5 100644
> --- a/drivers/video/fbdev/pxafb.c
> +++ b/drivers/video/fbdev/pxafb.c
> @@ -2234,10 +2234,8 @@ static struct pxafb_mach_info *of_pxafb_of_mach_info(struct device *dev)
> if (!info)
> return ERR_PTR(-ENOMEM);
> ret = of_get_pxafb_mode_info(dev, info);
> - if (ret) {
> - kfree(info->modes);
> + if (ret)
> return ERR_PTR(ret);
> - }
>
> /*
> * On purpose, neither lccrX registers nor video memory size can be
>


2018-11-19 01:26:38

by Yue Haibing

[permalink] [raw]
Subject: Re: [PATCH -next] video: fbdev: pxafb: Fix "WARNING: invalid free of devm_ allocated data"


On 2018/11/17 4:05, Daniel Mack wrote:
> On 16/11/2018 12:02 PM, YueHaibing wrote:
>> 'info->modes' got allocated with devm_kcalloc in of_get_pxafb_display.
>>
>> This gives this error message:
>> ./drivers/video/fbdev/pxafb.c:2238:2-7: WARNING: invalid free of devm_ allocated data
>>
>> Signed-off-by: YueHaibing <[email protected]>
>
> Oh, yes. Thanks for spotting this!
>
> Could you please add these lines to the patch and resubmit?
>

Sure, will send v2.

>
> Fixes: c8f96304ec8b4 ("video: fbdev: pxafb: switch to devm_* API")
> Cc: [email protected] [v4.19+]
> Reviewed-by: Daniel Mack <[email protected]>
>
>
>
>
>> ---
>> drivers/video/fbdev/pxafb.c | 4 +---
>> 1 file changed, 1 insertion(+), 3 deletions(-)
>>
>> diff --git a/drivers/video/fbdev/pxafb.c b/drivers/video/fbdev/pxafb.c
>> index bbed039..d59c8a5 100644
>> --- a/drivers/video/fbdev/pxafb.c
>> +++ b/drivers/video/fbdev/pxafb.c
>> @@ -2234,10 +2234,8 @@ static struct pxafb_mach_info *of_pxafb_of_mach_info(struct device *dev)
>> if (!info)
>> return ERR_PTR(-ENOMEM);
>> ret = of_get_pxafb_mode_info(dev, info);
>> - if (ret) {
>> - kfree(info->modes);
>> + if (ret)
>> return ERR_PTR(ret);
>> - }
>> /*
>> * On purpose, neither lccrX registers nor video memory size can be
>>
>
>
> .
>


Subject: Re: [PATCH -next] video: fbdev: pxafb: Fix "WARNING: invalid free of devm_ allocated data"


On 11/16/2018 12:02 PM, YueHaibing wrote:
> 'info->modes' got allocated with devm_kcalloc in of_get_pxafb_display.
>
> This gives this error message:
> ./drivers/video/fbdev/pxafb.c:2238:2-7: WARNING: invalid free of devm_ allocated data
>
> Signed-off-by: YueHaibing <[email protected]>

Patch queued for 4.21, thanks.

Best regards,
--
Bartlomiej Zolnierkiewicz
Samsung R&D Institute Poland
Samsung Electronics

Subject: Re: [PATCH -next] video: fbdev: pxafb: Fix "WARNING: invalid free of devm_ allocated data"


On 12/20/2018 05:55 PM, Bartlomiej Zolnierkiewicz wrote:
>
> On 11/16/2018 12:02 PM, YueHaibing wrote:
>> 'info->modes' got allocated with devm_kcalloc in of_get_pxafb_display.
>>
>> This gives this error message:
>> ./drivers/video/fbdev/pxafb.c:2238:2-7: WARNING: invalid free of devm_ allocated data
>>
>> Signed-off-by: YueHaibing <[email protected]>
>
> Patch queued for 4.21, thanks.

I've just noticed v2, I will queue it instead..

Best regards,
--
Bartlomiej Zolnierkiewicz
Samsung R&D Institute Poland
Samsung Electronics