KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

freedreno/ir3: Fix use after free 

If the tex/sfu ssa src is from a different block than the one currently
being scheduled, we do not have a valid sched-node.  So fallback to
previous behavior rather than dereference an invalid ptr.

Fixes: 7821e5a3f8 ("ir3/sched: Don't penalize uses of already-waited tex/SFU")
Signed-off-by: Rob Clark <robdclark@chromium.org>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/10306>
This commit is contained in:
Rob Clark 2021-04-18 09:10:07 -07:00 committed by Marge Bot
parent ddf970af88
commit 09f64f74db
1 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/freedreno/ir3/ir3_sched.c
View File

@ -194,6 +194,12 @@ is_outstanding_tex_or_prefetch(struct ir3_instruction *instr, struct ir3_sched_c
if (!is_tex_or_prefetch(instr))
return false;
/* The sched node is only valid within the same block, we cannot
* really say anything about src's from other blocks
*/
if (instr->block != ctx->block)
return true;
struct ir3_sched_node *n = instr->data;
return n->tex_index >= ctx->first_outstanding_tex_index;
}
@ -204,6 +210,12 @@ is_outstanding_sfu(struct ir3_instruction *instr, struct ir3_sched_ctx *ctx)
if (!is_sfu(instr))
return false;
/* The sched node is only valid within the same block, we cannot
* really say anything about src's from other blocks
*/
if (instr->block != ctx->block)
return true;
struct ir3_sched_node *n = instr->data;
return n->sfu_index >= ctx->first_outstanding_sfu_index;
}