This is a note to let you know that I've just added the patch titled drm/vkms: check plane_composer->map[0] before using it to the 5.19-stable tree which can be found at: http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary The filename of the patch is: drm-vkms-check-plane_composer-map-0-before-using-it.patch and it can be found in the queue-5.19 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let <stable@xxxxxxxxxxxxxxx> know about it. commit e5d15f50cfa4773148e288abacfa2be44b84c028 Author: Tales Lelo da Aparecida <tales.aparecida@xxxxxxxxx> Date: Fri Apr 15 08:12:59 2022 -0300 drm/vkms: check plane_composer->map[0] before using it [ Upstream commit 24f6fe3226c6f9f1b8406311a96b59c6e650b707 ] Fix a copypasta error. The caller of compose_plane() already checks primary_composer->map. In contrast, plane_composer->map is never verified here before handling. Fixes: 7938f4218168 ("dma-buf-map: Rename to iosys-map") Reviewed-by: André Almeida <andrealmeid@xxxxxxxxxx> Signed-off-by: Tales Lelo da Aparecida <tales.aparecida@xxxxxxxxx> Signed-off-by: Melissa Wen <melissa.srw@xxxxxxxxx> Link: https://patchwork.freedesktop.org/patch/msgid/20220415111300.61013-2-tales.aparecida@xxxxxxxxx Signed-off-by: Sasha Levin <sashal@xxxxxxxxxx> 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;