* [PATCH] drm/mediatek: Fix potential memory leak if vmap() fail
@ 2023-06-26 18:58 Sui Jingfeng
2023-07-06 11:39 ` Matthias Brugger
` (2 more replies)
0 siblings, 3 replies; 7+ messages in thread
From: Sui Jingfeng @ 2023-06-26 18:58 UTC (permalink / raw)
To: Chun-Kuang Hu, Philipp Zabel, David Airlie, Daniel Vetter,
Matthias Brugger, AngeloGioacchino Del Regno
Cc: linux-arm-kernel, linux-mediatek, linux-kernel, dri-devel
Also return -ENOMEM if such a failure happens, the implement should take
responsibility for the error handling.
Signed-off-by: Sui Jingfeng <suijingfeng@loongson.cn>
---
drivers/gpu/drm/mediatek/mtk_drm_gem.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/mediatek/mtk_drm_gem.c b/drivers/gpu/drm/mediatek/mtk_drm_gem.c
index a25b28d3ee90..9f364df52478 100644
--- a/drivers/gpu/drm/mediatek/mtk_drm_gem.c
+++ b/drivers/gpu/drm/mediatek/mtk_drm_gem.c
@@ -247,7 +247,11 @@ int mtk_drm_gem_prime_vmap(struct drm_gem_object *obj, struct iosys_map *map)
mtk_gem->kvaddr = vmap(mtk_gem->pages, npages, VM_MAP,
pgprot_writecombine(PAGE_KERNEL));
-
+ if (!mtk_gem->kvaddr) {
+ kfree(sgt);
+ kfree(mtk_gem->pages);
+ return -ENOMEM;
+ }
out:
kfree(sgt);
iosys_map_set_vaddr(map, mtk_gem->kvaddr);
--
2.25.1
^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [PATCH] drm/mediatek: Fix potential memory leak if vmap() fail
2023-06-26 18:58 [PATCH] drm/mediatek: Fix potential memory leak if vmap() fail Sui Jingfeng
@ 2023-07-06 11:39 ` Matthias Brugger
2023-07-06 12:46 ` suijingfeng
2023-07-06 12:13 ` Alexandre Mergnat
2023-07-06 12:47 ` AngeloGioacchino Del Regno
2 siblings, 1 reply; 7+ messages in thread
From: Matthias Brugger @ 2023-07-06 11:39 UTC (permalink / raw)
To: Sui Jingfeng, Chun-Kuang Hu, Philipp Zabel, David Airlie,
Daniel Vetter, AngeloGioacchino Del Regno
Cc: linux-arm-kernel, linux-mediatek, linux-kernel, dri-devel
On 26/06/2023 20:58, Sui Jingfeng wrote:
> Also return -ENOMEM if such a failure happens, the implement should take
> responsibility for the error handling.
>
> Signed-off-by: Sui Jingfeng <suijingfeng@loongson.cn>
> ---
> drivers/gpu/drm/mediatek/mtk_drm_gem.c | 6 +++++-
> 1 file changed, 5 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/mediatek/mtk_drm_gem.c b/drivers/gpu/drm/mediatek/mtk_drm_gem.c
> index a25b28d3ee90..9f364df52478 100644
> --- a/drivers/gpu/drm/mediatek/mtk_drm_gem.c
> +++ b/drivers/gpu/drm/mediatek/mtk_drm_gem.c
> @@ -247,7 +247,11 @@ int mtk_drm_gem_prime_vmap(struct drm_gem_object *obj, struct iosys_map *map)
>
> mtk_gem->kvaddr = vmap(mtk_gem->pages, npages, VM_MAP,
> pgprot_writecombine(PAGE_KERNEL));
> -
> + if (!mtk_gem->kvaddr) {
> + kfree(sgt);
> + kfree(mtk_gem->pages);
> + return -ENOMEM;
> + }
Reviewed-by: Matthias Brugger <matthias.bgg@gmail.com>
> out:
> kfree(sgt);
> iosys_map_set_vaddr(map, mtk_gem->kvaddr);
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH] drm/mediatek: Fix potential memory leak if vmap() fail
2023-06-26 18:58 [PATCH] drm/mediatek: Fix potential memory leak if vmap() fail Sui Jingfeng
2023-07-06 11:39 ` Matthias Brugger
@ 2023-07-06 12:13 ` Alexandre Mergnat
2023-07-06 12:47 ` suijingfeng
2023-07-06 12:47 ` AngeloGioacchino Del Regno
2 siblings, 1 reply; 7+ messages in thread
From: Alexandre Mergnat @ 2023-07-06 12:13 UTC (permalink / raw)
To: Sui Jingfeng, Chun-Kuang Hu, Philipp Zabel, David Airlie,
Daniel Vetter, Matthias Brugger, AngeloGioacchino Del Regno
Cc: linux-arm-kernel, linux-mediatek, linux-kernel, dri-devel
On 26/06/2023 20:58, Sui Jingfeng wrote:
> Also return -ENOMEM if such a failure happens, the implement should take
> responsibility for the error handling.
Reviewed-by: Alexandre Mergnat <amergnat@baylibre.com>
--
Regards,
Alexandre
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH] drm/mediatek: Fix potential memory leak if vmap() fail
2023-07-06 11:39 ` Matthias Brugger
@ 2023-07-06 12:46 ` suijingfeng
0 siblings, 0 replies; 7+ messages in thread
From: suijingfeng @ 2023-07-06 12:46 UTC (permalink / raw)
To: Matthias Brugger, Chun-Kuang Hu, Philipp Zabel, David Airlie,
Daniel Vetter, AngeloGioacchino Del Regno
Cc: linux-arm-kernel, loongson-kernel, linux-mediatek, linux-kernel,
dri-devel
Hi, Thanks a lot!
On 2023/7/6 19:39, Matthias Brugger wrote:
>
>
> On 26/06/2023 20:58, Sui Jingfeng wrote:
>> Also return -ENOMEM if such a failure happens, the implement should take
>> responsibility for the error handling.
>>
>> Signed-off-by: Sui Jingfeng <suijingfeng@loongson.cn>
>> ---
>> drivers/gpu/drm/mediatek/mtk_drm_gem.c | 6 +++++-
>> 1 file changed, 5 insertions(+), 1 deletion(-)
>>
>> diff --git a/drivers/gpu/drm/mediatek/mtk_drm_gem.c
>> b/drivers/gpu/drm/mediatek/mtk_drm_gem.c
>> index a25b28d3ee90..9f364df52478 100644
>> --- a/drivers/gpu/drm/mediatek/mtk_drm_gem.c
>> +++ b/drivers/gpu/drm/mediatek/mtk_drm_gem.c
>> @@ -247,7 +247,11 @@ int mtk_drm_gem_prime_vmap(struct drm_gem_object
>> *obj, struct iosys_map *map)
>> mtk_gem->kvaddr = vmap(mtk_gem->pages, npages, VM_MAP,
>> pgprot_writecombine(PAGE_KERNEL));
>> -
>> + if (!mtk_gem->kvaddr) {
>> + kfree(sgt);
>> + kfree(mtk_gem->pages);
>> + return -ENOMEM;
>> + }
>
> Reviewed-by: Matthias Brugger <matthias.bgg@gmail.com>
>
>> out:
>> kfree(sgt);
>> iosys_map_set_vaddr(map, mtk_gem->kvaddr);
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH] drm/mediatek: Fix potential memory leak if vmap() fail
2023-07-06 12:13 ` Alexandre Mergnat
@ 2023-07-06 12:47 ` suijingfeng
0 siblings, 0 replies; 7+ messages in thread
From: suijingfeng @ 2023-07-06 12:47 UTC (permalink / raw)
To: Alexandre Mergnat, Chun-Kuang Hu, Philipp Zabel, David Airlie,
Daniel Vetter, Matthias Brugger, AngeloGioacchino Del Regno
Cc: linux-arm-kernel, loongson-kernel, linux-mediatek, linux-kernel,
dri-devel
Hi, thanks a lot!
On 2023/7/6 20:13, Alexandre Mergnat wrote:
>
>
> On 26/06/2023 20:58, Sui Jingfeng wrote:
>> Also return -ENOMEM if such a failure happens, the implement should take
>> responsibility for the error handling.
>
> Reviewed-by: Alexandre Mergnat <amergnat@baylibre.com>
>
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH] drm/mediatek: Fix potential memory leak if vmap() fail
2023-06-26 18:58 [PATCH] drm/mediatek: Fix potential memory leak if vmap() fail Sui Jingfeng
2023-07-06 11:39 ` Matthias Brugger
2023-07-06 12:13 ` Alexandre Mergnat
@ 2023-07-06 12:47 ` AngeloGioacchino Del Regno
2023-07-06 13:43 ` suijingfeng
2 siblings, 1 reply; 7+ messages in thread
From: AngeloGioacchino Del Regno @ 2023-07-06 12:47 UTC (permalink / raw)
To: Sui Jingfeng, Chun-Kuang Hu, Philipp Zabel, David Airlie,
Daniel Vetter, Matthias Brugger
Cc: linux-arm-kernel, linux-mediatek, linux-kernel, dri-devel
Il 26/06/23 20:58, Sui Jingfeng ha scritto:
> Also return -ENOMEM if such a failure happens, the implement should take
> responsibility for the error handling.
>
> Signed-off-by: Sui Jingfeng <suijingfeng@loongson.cn>
This commit needs a Fixes tag. Please add the relevant one and resend.
Thanks,
Angelo
> ---
> drivers/gpu/drm/mediatek/mtk_drm_gem.c | 6 +++++-
> 1 file changed, 5 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/mediatek/mtk_drm_gem.c b/drivers/gpu/drm/mediatek/mtk_drm_gem.c
> index a25b28d3ee90..9f364df52478 100644
> --- a/drivers/gpu/drm/mediatek/mtk_drm_gem.c
> +++ b/drivers/gpu/drm/mediatek/mtk_drm_gem.c
> @@ -247,7 +247,11 @@ int mtk_drm_gem_prime_vmap(struct drm_gem_object *obj, struct iosys_map *map)
>
> mtk_gem->kvaddr = vmap(mtk_gem->pages, npages, VM_MAP,
> pgprot_writecombine(PAGE_KERNEL));
> -
> + if (!mtk_gem->kvaddr) {
> + kfree(sgt);
> + kfree(mtk_gem->pages);
> + return -ENOMEM;
> + }
> out:
> kfree(sgt);
> iosys_map_set_vaddr(map, mtk_gem->kvaddr);
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH] drm/mediatek: Fix potential memory leak if vmap() fail
2023-07-06 12:47 ` AngeloGioacchino Del Regno
@ 2023-07-06 13:43 ` suijingfeng
0 siblings, 0 replies; 7+ messages in thread
From: suijingfeng @ 2023-07-06 13:43 UTC (permalink / raw)
To: AngeloGioacchino Del Regno, Chun-Kuang Hu, Philipp Zabel,
David Airlie, Daniel Vetter, Matthias Brugger
Cc: linux-arm-kernel, loongson-kernel, linux-mediatek, linux-kernel,
dri-devel
Hi,
On 2023/7/6 20:47, AngeloGioacchino Del Regno wrote:
> Il 26/06/23 20:58, Sui Jingfeng ha scritto:
>> Also return -ENOMEM if such a failure happens, the implement should take
>> responsibility for the error handling.
>>
>> Signed-off-by: Sui Jingfeng <suijingfeng@loongson.cn>
>
> This commit needs a Fixes tag. Please add the relevant one and resend.
>
Done at [1],
Thanks for point this out, I got it.
[1] https://patchwork.freedesktop.org/patch/545843/?series=119885&rev=2
> Thanks,
> Angelo
>
>> ---
>> drivers/gpu/drm/mediatek/mtk_drm_gem.c | 6 +++++-
>> 1 file changed, 5 insertions(+), 1 deletion(-)
>>
>> diff --git a/drivers/gpu/drm/mediatek/mtk_drm_gem.c
>> b/drivers/gpu/drm/mediatek/mtk_drm_gem.c
>> index a25b28d3ee90..9f364df52478 100644
>> --- a/drivers/gpu/drm/mediatek/mtk_drm_gem.c
>> +++ b/drivers/gpu/drm/mediatek/mtk_drm_gem.c
>> @@ -247,7 +247,11 @@ int mtk_drm_gem_prime_vmap(struct drm_gem_object
>> *obj, struct iosys_map *map)
>> mtk_gem->kvaddr = vmap(mtk_gem->pages, npages, VM_MAP,
>> pgprot_writecombine(PAGE_KERNEL));
>> -
>> + if (!mtk_gem->kvaddr) {
>> + kfree(sgt);
>> + kfree(mtk_gem->pages);
>> + return -ENOMEM;
>> + }
>> out:
>> kfree(sgt);
>> iosys_map_set_vaddr(map, mtk_gem->kvaddr);
>
>
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2023-07-06 13:43 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-06-26 18:58 [PATCH] drm/mediatek: Fix potential memory leak if vmap() fail Sui Jingfeng
2023-07-06 11:39 ` Matthias Brugger
2023-07-06 12:46 ` suijingfeng
2023-07-06 12:13 ` Alexandre Mergnat
2023-07-06 12:47 ` suijingfeng
2023-07-06 12:47 ` AngeloGioacchino Del Regno
2023-07-06 13:43 ` suijingfeng
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).