lkml.org 
[lkml]   [2022]   [Jun]   [7]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.15 292/667] drm/msm: return an error pointer in msm_gem_prime_get_sg_table()
    Date
    From: Dan Carpenter <dan.carpenter@oracle.com>

    [ Upstream commit cf575e31611eb6dccf08fad02e57e35b2187704d ]

    The msm_gem_prime_get_sg_table() needs to return error pointers on
    error. This is called from drm_gem_map_dma_buf() and returning a
    NULL will lead to a crash in that function.

    Fixes: ac45146733b0 ("drm/msm: fix msm_gem_prime_get_sg_table()")
    Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
    Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
    Patchwork: https://patchwork.freedesktop.org/patch/485023/
    Link: https://lore.kernel.org/r/YnOmtS5tfENywR9m@kili
    Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/gpu/drm/msm/msm_gem_prime.c | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    diff --git a/drivers/gpu/drm/msm/msm_gem_prime.c b/drivers/gpu/drm/msm/msm_gem_prime.c
    index fc94e061d6a7..8a2d94bd5df2 100644
    --- a/drivers/gpu/drm/msm/msm_gem_prime.c
    +++ b/drivers/gpu/drm/msm/msm_gem_prime.c
    @@ -17,7 +17,7 @@ struct sg_table *msm_gem_prime_get_sg_table(struct drm_gem_object *obj)
    int npages = obj->size >> PAGE_SHIFT;

    if (WARN_ON(!msm_obj->pages)) /* should have already pinned! */
    - return NULL;
    + return ERR_PTR(-ENOMEM);

    return drm_prime_pages_to_sg(obj->dev, msm_obj->pages, npages);
    }
    --
    2.35.1


    \
     
     \ /
      Last update: 2022-06-07 21:07    [W:4.081 / U:0.764 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site