lkml.org 
[lkml]   [2022]   [Aug]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.19 0357/1157] drm/vkms: check plane_composer->map[0] before using it
    Date
    From: Tales Lelo da Aparecida <tales.aparecida@gmail.com>

    [ 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@riseup.net>
    Signed-off-by: Tales Lelo da Aparecida <tales.aparecida@gmail.com>
    Signed-off-by: Melissa Wen <melissa.srw@gmail.com>
    Link: https://patchwork.freedesktop.org/patch/msgid/20220415111300.61013-2-tales.aparecida@gmail.com
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    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


    \
     
     \ /
      Last update: 2022-08-16 01:33    [W:2.819 / U:0.432 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site