fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-02-03 08:40:28 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

gallivm: fix ssbo oob reads

Browse source 
this was checking (offset < size) when really it needs to be
(offset < size && extent < size && offset >= 0)

Fixes: 591899eedd ("gallivm/nir: Add a short circuit uniform-offset mode for load_ssbo/load_shared.")

Reviewed-by: Dave Airlie <airlied@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/16137>
(cherry picked from commit aa98a90265)
This commit is contained in:
Mike Blumenkrantz 2022-04-22 13:52:22 -04:00 • committed by Dylan Baker
parent e2c69cd976
commit 659e41fe79
2 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.pick_status.json
View file

@ -391,7 +391,7 @@
"description": "gallivm: fix ssbo oob reads",
"nominated": true,
"nomination_type": 1,
"resolution": 0,
"resolution": 1,
"main_sha": null,
"because_sha": "591899eedd2d797bfdb7dbb6b3e2169d50d42109"
},

7
src/gallium/auxiliary/gallivm/lp_bld_nir_soa.c
View file

@ -1181,9 +1181,12 @@ static void emit_load_mem(struct lp_build_nir_context *bld_base,
LLVMValueRef res_store = lp_build_alloca(gallivm, LLVMTypeOf(zero), "");
LLVMBuildStore(builder, zero, res_store);
LLVMValueRef fetch_cond = LLVMBuildICmp(gallivm->builder, LLVMIntUGE, ssbo_limit, chan_offset, "");
LLVMValueRef fetch_extent = LLVMBuildAdd(builder, chan_offset, lp_build_const_int32(gallivm, 1), "");
LLVMValueRef fetch_cond = LLVMBuildICmp(gallivm->builder, LLVMIntUGE, ssbo_limit, fetch_extent, "");
LLVMValueRef fetch_cond2 = LLVMBuildICmp(gallivm->builder, LLVMIntSGE, chan_offset, lp_build_const_int32(gallivm, 0), "");
LLVMValueRef fetch_cond_final = LLVMBuildAnd(gallivm->builder, fetch_cond, fetch_cond2, "");
struct lp_build_if_state ifthen;
lp_build_if(&ifthen, gallivm, fetch_cond);
lp_build_if(&ifthen, gallivm, fetch_cond_final);
LLVMBuildStore(builder, lp_build_pointer_get(builder, mem_ptr, chan_offset), res_store);
lp_build_endif(&ifthen);