mirror of
https://gitlab.freedesktop.org/mesa/mesa.git
synced 2025-12-25 15:10:10 +01:00
gallium/radeon: protect against out of bounds temporary array accesses
They can lead to VM faults and worse, which goes against the GL robustness promises. Reviewed-by: Marek Olšák <marek.olsak@amd.com>
This commit is contained in:
parent
ea283779be
commit
f4204ba53d
1 changed files with 15 additions and 0 deletions
|
|
@ -239,6 +239,21 @@ get_pointer_into_array(struct radeon_llvm_context *ctx,
|
|||
|
||||
index = emit_array_index(&ctx->soa, reg_indirect,
|
||||
reg_index - ctx->temp_arrays[array_id - 1].range.First);
|
||||
|
||||
/* Ensure that the index is within a valid range, to guard against
|
||||
* VM faults and overwriting critical data (e.g. spilled resource
|
||||
* descriptors).
|
||||
*
|
||||
* TODO It should be possible to avoid the additional instructions
|
||||
* if LLVM is changed so that it guarantuees:
|
||||
* 1. the scratch space descriptor isolates the current wave (this
|
||||
* could even save the scratch offset SGPR at the cost of an
|
||||
* additional SALU instruction)
|
||||
* 2. the memory for allocas must be allocated at the _end_ of the
|
||||
* scratch space (after spilled registers)
|
||||
*/
|
||||
index = radeon_llvm_bound_index(ctx, index, array->range.Last - array->range.First + 1);
|
||||
|
||||
index = LLVMBuildMul(
|
||||
builder, index,
|
||||
lp_build_const_int32(gallivm, util_bitcount(array->writemask)),
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue