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

nir/lower_io: Add data OOB asserts to write_constant 

Reviewed-by: Jesse Natalie <jenatali@microsoft.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/7565>
This commit is contained in:
Jason Ekstrand 2020-11-03 11:07:07 -06:00 committed by Marge Bot
parent 791fecfae1
commit f727e98d22
1 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/compiler/nir/nir_lower_io.c
View File

@ -2324,7 +2324,8 @@ nir_lower_vars_to_explicit_types(nir_shader *shader,
} }
static void static void
write_constant(void *dst, const nir_constant *c, const struct glsl_type *type) write_constant(void *dst, size_t dst_size,
const nir_constant *c, const struct glsl_type *type)
{ {
if (glsl_type_is_vector_or_scalar(type)) { if (glsl_type_is_vector_or_scalar(type)) {
const unsigned num_components = glsl_get_vector_elements(type); const unsigned num_components = glsl_get_vector_elements(type);
@ -2334,6 +2335,7 @@ write_constant(void *dst, const nir_constant *c, const struct glsl_type *type)
* *
* TODO: Make the native bool bit_size an option. * TODO: Make the native bool bit_size an option.
*/ */
assert(num_components * 4 <= dst_size);
for (unsigned i = 0; i < num_components; i++) { for (unsigned i = 0; i < num_components; i++) {
int32_t b32 = -(int)c->values[i].b; int32_t b32 = -(int)c->values[i].b;
memcpy((char *)dst + i * 4, &b32, 4); memcpy((char *)dst + i * 4, &b32, 4);
@ -2341,6 +2343,7 @@ write_constant(void *dst, const nir_constant *c, const struct glsl_type *type)
} else { } else {
assert(bit_size >= 8 && bit_size % 8 == 0); assert(bit_size >= 8 && bit_size % 8 == 0);
const unsigned byte_size = bit_size / 8; const unsigned byte_size = bit_size / 8;
assert(num_components * byte_size <= dst_size);
for (unsigned i = 0; i < num_components; i++) { for (unsigned i = 0; i < num_components; i++) {
/* Annoyingly, thanks to packed structs, we can't make any /* Annoyingly, thanks to packed structs, we can't make any
* assumptions about the alignment of dst. To avoid any strange * assumptions about the alignment of dst. To avoid any strange
@ -2354,16 +2357,21 @@ write_constant(void *dst, const nir_constant *c, const struct glsl_type *type)
const unsigned stride = glsl_get_explicit_stride(type); const unsigned stride = glsl_get_explicit_stride(type);
assert(stride > 0); assert(stride > 0);
const struct glsl_type *elem_type = glsl_get_array_element(type); const struct glsl_type *elem_type = glsl_get_array_element(type);
for (unsigned i = 0; i < array_len; i++) for (unsigned i = 0; i < array_len; i++) {
write_constant((char *)dst + i * stride, c->elements[i], elem_type); unsigned elem_offset = i * stride;
assert(elem_offset < dst_size);
write_constant((char *)dst + elem_offset, dst_size - elem_offset,
c->elements[i], elem_type);
}
} else { } else {
assert(glsl_type_is_struct_or_ifc(type)); assert(glsl_type_is_struct_or_ifc(type));
const unsigned num_fields = glsl_get_length(type); const unsigned num_fields = glsl_get_length(type);
for (unsigned i = 0; i < num_fields; i++) { for (unsigned i = 0; i < num_fields; i++) {
const int field_offset = glsl_get_struct_field_offset(type, i); const int field_offset = glsl_get_struct_field_offset(type, i);
assert(field_offset >= 0); assert(field_offset >= 0 && field_offset < dst_size);
const struct glsl_type *field_type = glsl_get_struct_field(type, i); const struct glsl_type *field_type = glsl_get_struct_field(type, i);
write_constant((char *)dst + field_offset, c->elements[i], field_type); write_constant((char *)dst + field_offset, dst_size - field_offset,
c->elements[i], field_type);
} }
} }
} }
@ -2383,8 +2391,11 @@ nir_lower_mem_constant_vars(nir_shader *shader,
shader->constant_data_size); shader->constant_data_size);
nir_foreach_variable_with_modes(var, shader, nir_var_mem_constant) { nir_foreach_variable_with_modes(var, shader, nir_var_mem_constant) {
assert(var->data.driver_location < shader->constant_data_size);
write_constant((char *)shader->constant_data + write_constant((char *)shader->constant_data +
var->data.driver_location, var->data.driver_location,
shader->constant_data_size -
var->data.driver_location,
var->constant_initializer, var->type); var->constant_initializer, var->type);
} }
progress = true; progress = true;