* [PATCH] drm/vkms: Release pages_lock before return
@ 2018-08-03 20:11 Haneen Mohammed
2018-08-03 20:20 ` Sean Paul
0 siblings, 1 reply; 2+ messages in thread
From: Haneen Mohammed @ 2018-08-03 20:11 UTC (permalink / raw
To: dri-devel; +Cc: hamohammed.sa, rodrigosiqueiramelo
Release pages_lock before return when vkms_obj->vaddr is NULL.
This patch fixes: 6c234fe37c57 ("drm/vkms: Implement CRC debugfs API").
Signed-off-by: Haneen Mohammed <hamohammed.sa@gmail.com>
---
drivers/gpu/drm/vkms/vkms_crc.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/drivers/gpu/drm/vkms/vkms_crc.c b/drivers/gpu/drm/vkms/vkms_crc.c
index 9b909221943f..37d717f38e3c 100644
--- a/drivers/gpu/drm/vkms/vkms_crc.c
+++ b/drivers/gpu/drm/vkms/vkms_crc.c
@@ -22,14 +22,15 @@ static uint32_t _vkms_get_crc(struct vkms_crc_data *crc_data)
mutex_lock(&vkms_obj->pages_lock);
vaddr = vkms_obj->vaddr;
if (WARN_ON(!vaddr))
- return crc;
+ goto out;
for (i = y; i < y + height; i++) {
src_offset = fb->offsets[0] + (i * fb->pitches[0]) + (x * cpp);
crc = crc32_le(crc, vaddr + src_offset, size_byte);
}
- mutex_unlock(&vkms_obj->pages_lock);
+out:
+ mutex_unlock(&vkms_obj->pages_lock);
return crc;
}
--
2.17.1
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] drm/vkms: Release pages_lock before return
2018-08-03 20:11 [PATCH] drm/vkms: Release pages_lock before return Haneen Mohammed
@ 2018-08-03 20:20 ` Sean Paul
0 siblings, 0 replies; 2+ messages in thread
From: Sean Paul @ 2018-08-03 20:20 UTC (permalink / raw
To: Haneen Mohammed; +Cc: rodrigosiqueiramelo, dri-devel
On Fri, Aug 03, 2018 at 11:11:42PM +0300, Haneen Mohammed wrote:
> Release pages_lock before return when vkms_obj->vaddr is NULL.
> This patch fixes: 6c234fe37c57 ("drm/vkms: Implement CRC debugfs API").
>
> Signed-off-by: Haneen Mohammed <hamohammed.sa@gmail.com>
Thanks for fixing this up. Pushed to drm-misc-next.
Sean
> ---
> drivers/gpu/drm/vkms/vkms_crc.c | 5 +++--
> 1 file changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/gpu/drm/vkms/vkms_crc.c b/drivers/gpu/drm/vkms/vkms_crc.c
> index 9b909221943f..37d717f38e3c 100644
> --- a/drivers/gpu/drm/vkms/vkms_crc.c
> +++ b/drivers/gpu/drm/vkms/vkms_crc.c
> @@ -22,14 +22,15 @@ static uint32_t _vkms_get_crc(struct vkms_crc_data *crc_data)
> mutex_lock(&vkms_obj->pages_lock);
> vaddr = vkms_obj->vaddr;
> if (WARN_ON(!vaddr))
> - return crc;
> + goto out;
>
> for (i = y; i < y + height; i++) {
> src_offset = fb->offsets[0] + (i * fb->pitches[0]) + (x * cpp);
> crc = crc32_le(crc, vaddr + src_offset, size_byte);
> }
> - mutex_unlock(&vkms_obj->pages_lock);
>
> +out:
> + mutex_unlock(&vkms_obj->pages_lock);
> return crc;
> }
>
> --
> 2.17.1
>
--
Sean Paul, Software Engineer, Google / Chromium OS
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2018-08-03 20:20 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-08-03 20:11 [PATCH] drm/vkms: Release pages_lock before return Haneen Mohammed
2018-08-03 20:20 ` Sean Paul
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.