lkml.org 
[lkml]   [2021]   [Mar]   [1]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.11 508/775] drm/msm: Fix legacy relocs path
    Date
    From: Rob Clark <robdclark@chromium.org>

    [ Upstream commit c8d99bb938d3303989c4988caf090084073e85a2 ]

    In moving code around, we ended up using the same pointer to
    copy_from_user() the relocs tables as we used for the cmd table
    entry, which is clearly not right. This went unnoticed because
    modern mesa on non-ancent kernels does not actually use relocs.
    But this broke ancient mesa on modern kernels.

    Reported-by: Emil Velikov <emil.velikov@collabora.com>
    Fixes: 20224d715a88 ("drm/msm/submit: Move copy_from_user ahead of locking bos")
    Signed-off-by: Rob Clark <robdclark@chromium.org>
    Reviewed-by: Akhil P Oommen <akhilpo@codeaurora.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/gpu/drm/msm/msm_gem_submit.c | 2 ++
    1 file changed, 2 insertions(+)

    diff --git a/drivers/gpu/drm/msm/msm_gem_submit.c b/drivers/gpu/drm/msm/msm_gem_submit.c
    index d04c349d8112a..5480852bdedaf 100644
    --- a/drivers/gpu/drm/msm/msm_gem_submit.c
    +++ b/drivers/gpu/drm/msm/msm_gem_submit.c
    @@ -198,6 +198,8 @@ static int submit_lookup_cmds(struct msm_gem_submit *submit,
    submit->cmd[i].idx = submit_cmd.submit_idx;
    submit->cmd[i].nr_relocs = submit_cmd.nr_relocs;

    + userptr = u64_to_user_ptr(submit_cmd.relocs);
    +
    sz = array_size(submit_cmd.nr_relocs,
    sizeof(struct drm_msm_gem_submit_reloc));
    /* check for overflow: */
    --
    2.27.0


    \
     
     \ /
      Last update: 2021-03-02 05:10    [W:4.023 / U:0.800 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site