linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH -next] drm/vkms: Fix possible memory leak in _vkms_get_crc()
@ 2018-09-15  1:53 Wei Yongjun
  2018-09-21  8:50 ` Daniel Vetter
  0 siblings, 1 reply; 2+ messages in thread
From: Wei Yongjun @ 2018-09-15  1:53 UTC (permalink / raw)
  To: David Airlie, Haneen Mohammed, Sean Paul, Mahesh Kumar,
	Daniel Vetter, Maarten Lankhorst
  Cc: Wei Yongjun, dri-devel, linux-kernel, kernel-janitors

'vaddr_out' is malloced in _vkms_get_crc() and should be freed before
leaving from the error handling cases, otherwise it will cause memory
leak.

Fixes: db7f419c06d7 ("drm/vkms: Compute CRC with Cursor Plane")
Signed-off-by: Wei Yongjun <weiyongjun1@huawei.com>
---
 drivers/gpu/drm/vkms/vkms_crc.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/gpu/drm/vkms/vkms_crc.c b/drivers/gpu/drm/vkms/vkms_crc.c
index 0a27456..9d9e814 100644
--- a/drivers/gpu/drm/vkms/vkms_crc.c
+++ b/drivers/gpu/drm/vkms/vkms_crc.c
@@ -125,6 +125,7 @@ static uint32_t _vkms_get_crc(struct vkms_crc_data *primary_crc,
 	mutex_lock(&vkms_obj->pages_lock);
 	if (WARN_ON(!vkms_obj->vaddr)) {
 		mutex_unlock(&vkms_obj->pages_lock);
+		kfree(vaddr_out);
 		return crc;
 	}


^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: [PATCH -next] drm/vkms: Fix possible memory leak in _vkms_get_crc()
  2018-09-15  1:53 [PATCH -next] drm/vkms: Fix possible memory leak in _vkms_get_crc() Wei Yongjun
@ 2018-09-21  8:50 ` Daniel Vetter
  0 siblings, 0 replies; 2+ messages in thread
From: Daniel Vetter @ 2018-09-21  8:50 UTC (permalink / raw)
  To: Wei Yongjun
  Cc: David Airlie, Haneen Mohammed, Sean Paul, Mahesh Kumar,
	Daniel Vetter, Maarten Lankhorst, dri-devel, linux-kernel,
	kernel-janitors

On Sat, Sep 15, 2018 at 01:53:19AM +0000, Wei Yongjun wrote:
> 'vaddr_out' is malloced in _vkms_get_crc() and should be freed before
> leaving from the error handling cases, otherwise it will cause memory
> leak.
> 
> Fixes: db7f419c06d7 ("drm/vkms: Compute CRC with Cursor Plane")
> Signed-off-by: Wei Yongjun <weiyongjun1@huawei.com>

Applied, thanks for your patch.
-Daniel

> ---
>  drivers/gpu/drm/vkms/vkms_crc.c | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/drivers/gpu/drm/vkms/vkms_crc.c b/drivers/gpu/drm/vkms/vkms_crc.c
> index 0a27456..9d9e814 100644
> --- a/drivers/gpu/drm/vkms/vkms_crc.c
> +++ b/drivers/gpu/drm/vkms/vkms_crc.c
> @@ -125,6 +125,7 @@ static uint32_t _vkms_get_crc(struct vkms_crc_data *primary_crc,
>  	mutex_lock(&vkms_obj->pages_lock);
>  	if (WARN_ON(!vkms_obj->vaddr)) {
>  		mutex_unlock(&vkms_obj->pages_lock);
> +		kfree(vaddr_out);
>  		return crc;
>  	}
> 

-- 
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2018-09-21  8:50 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-09-15  1:53 [PATCH -next] drm/vkms: Fix possible memory leak in _vkms_get_crc() Wei Yongjun
2018-09-21  8:50 ` Daniel Vetter

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).