* [PATCH] drm/msm: Fix legacy relocs path
@ 2021-02-04 22:56 Rob Clark
2021-02-05 6:41 ` Akhil P Oommen
2021-03-01 19:59 ` patchwork-bot+linux-arm-msm
0 siblings, 2 replies; 3+ messages in thread
From: Rob Clark @ 2021-02-04 22:56 UTC (permalink / raw)
To: dri-devel
Cc: Rob Clark, Emil Velikov, Rob Clark, Sean Paul, David Airlie,
Daniel Vetter, Kristian H. Kristensen,
open list:DRM DRIVER FOR MSM ADRENO GPU,
open list:DRM DRIVER FOR MSM ADRENO GPU, open list
From: Rob Clark <robdclark@chromium.org>
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>
---
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 d04c349d8112..5480852bdeda 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.29.2
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] drm/msm: Fix legacy relocs path
2021-02-04 22:56 [PATCH] drm/msm: Fix legacy relocs path Rob Clark
@ 2021-02-05 6:41 ` Akhil P Oommen
2021-03-01 19:59 ` patchwork-bot+linux-arm-msm
1 sibling, 0 replies; 3+ messages in thread
From: Akhil P Oommen @ 2021-02-05 6:41 UTC (permalink / raw)
To: Rob Clark, dri-devel
Cc: Rob Clark, open list:DRM DRIVER FOR MSM ADRENO GPU, David Airlie,
open list:DRM DRIVER FOR MSM ADRENO GPU, open list,
Kristian H. Kristensen, Sean Paul, Emil Velikov
On 2/5/2021 4:26 AM, Rob Clark wrote:
> From: Rob Clark <robdclark@chromium.org>
>
> 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>
> ---
> 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 d04c349d8112..5480852bdeda 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: */
>
Reviewed-by: Akhil P Oommen <akhilpo@codeaurora.org>
-Akhil.
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] drm/msm: Fix legacy relocs path
2021-02-04 22:56 [PATCH] drm/msm: Fix legacy relocs path Rob Clark
2021-02-05 6:41 ` Akhil P Oommen
@ 2021-03-01 19:59 ` patchwork-bot+linux-arm-msm
1 sibling, 0 replies; 3+ messages in thread
From: patchwork-bot+linux-arm-msm @ 2021-03-01 19:59 UTC (permalink / raw)
To: Rob Clark; +Cc: linux-arm-msm
Hello:
This patch was applied to qcom/linux.git (refs/heads/for-next):
On Thu, 4 Feb 2021 14:56:49 -0800 you wrote:
> From: Rob Clark <robdclark@chromium.org>
>
> 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.
>
> [...]
Here is the summary with links:
- drm/msm: Fix legacy relocs path
https://git.kernel.org/qcom/c/c8d99bb938d3
You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2021-03-01 20:44 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-02-04 22:56 [PATCH] drm/msm: Fix legacy relocs path Rob Clark
2021-02-05 6:41 ` Akhil P Oommen
2021-03-01 19:59 ` patchwork-bot+linux-arm-msm
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).