[PATCH 0/1] drm/vkms: check plane_composer->map[0] before using it

[PATCH 0/1] drm/vkms: check plane_composer->map[0] before using it

[Tales Lelo da Aparecida]

Hello, I'm interested in collaborating with VKMS, please let me know if there's
anything that I could better.

Tales Lelo da Aparecida (1):
  drm/vkms: check plane_composer->map[0] before using it

 drivers/gpu/drm/vkms/vkms_composer.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

-- 
2.35.1

[PATCH 1/1] drm/vkms: check plane_composer->map[0] before using it

[Tales Lelo da Aparecida]

Fix a copypasta error, which resulted in checking repeatedly if the
primary_composer->map[0] was null, instead of checking each
plane_composer while composing planes.

Signed-off-by: Tales Lelo da Aparecida <tales.aparecida@gmail.com>
---
 drivers/gpu/drm/vkms/vkms_composer.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/vkms/vkms_composer.c b/drivers/gpu/drm/vkms/vkms_composer.c
index c6a1036bf2ea..b47ac170108c 100644
--- a/drivers/gpu/drm/vkms/vkms_composer.c
+++ b/drivers/gpu/drm/vkms/vkms_composer.c
@@ -157,7 +157,7 @@ static void compose_plane(struct vkms_composer *primary_composer,
 	void *vaddr;
 	void (*pixel_blend)(const u8 *p_src, u8 *p_dst);
 
-	if (WARN_ON(iosys_map_is_null(&primary_composer->map[0])))
+	if (WARN_ON(iosys_map_is_null(&plane_composer->map[0])))
 		return;
 
 	vaddr = plane_composer->map[0].vaddr;
-- 
2.35.1

Re: [PATCH 1/1] drm/vkms: check plane_composer->map[0] before using it

[André Almeida]

Hi Tales,

Às 20:38 de 11/04/22, Tales Lelo da Aparecida escreveu:
> Fix a copypasta error, which resulted in checking repeatedly if the
> primary_composer->map[0] was null, instead of checking each
> plane_composer while composing planes.
> 
> Signed-off-by: Tales Lelo da Aparecida <tales.aparecida@gmail.com>

Reviewed-by: André Almeida <andrealmeid@riseup.net>

Re: [PATCH 1/1] drm/vkms: check plane_composer->map[0] before using it

[Melissa Wen]

[-- Attachment #1: Type: text/plain, Size: 1456 bytes --]

On 04/11, Tales Lelo da Aparecida wrote:
> Fix a copypasta error, which resulted in checking repeatedly if the
> primary_composer->map[0] was null, instead of checking each
> plane_composer while composing planes.
> 
> Signed-off-by: Tales Lelo da Aparecida <tales.aparecida@gmail.com>

Hi Tales,

Nice catch!

I suggest you detail this issue with more information. The caller of
compose_plane() already checks primary_composer->map. In constrast,
plane_composer->map is never verified here before handling.
Also, add the 'Fixes' tag pointing to the commit that introduced this
issue.

Can you send a next version addressing these suggestions and already
adding Andre's reviewed-by tag?

Thanks for your patch.

Melissa

> ---
>  drivers/gpu/drm/vkms/vkms_composer.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/gpu/drm/vkms/vkms_composer.c b/drivers/gpu/drm/vkms/vkms_composer.c
> index c6a1036bf2ea..b47ac170108c 100644
> --- a/drivers/gpu/drm/vkms/vkms_composer.c
> +++ b/drivers/gpu/drm/vkms/vkms_composer.c
> @@ -157,7 +157,7 @@ static void compose_plane(struct vkms_composer *primary_composer,
>  	void *vaddr;
>  	void (*pixel_blend)(const u8 *p_src, u8 *p_dst);
>  
> -	if (WARN_ON(iosys_map_is_null(&primary_composer->map[0])))
> +	if (WARN_ON(iosys_map_is_null(&plane_composer->map[0])))
>  		return;
>  
>  	vaddr = plane_composer->map[0].vaddr;
> -- 
> 2.35.1
> 

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]