diff options
author | Samuel Pitoiset <samuel.pitoiset@gmail.com> | 2021-12-29 08:28:22 +0100 |
---|---|---|
committer | Samuel Pitoiset <samuel.pitoiset@gmail.com> | 2022-01-04 08:04:50 +0100 |
commit | 3ef736c94e1c8b168454d320bbabe104dc6667d3 (patch) | |
tree | 23da64fff51f176c77e402a1c1d8af6ec1c6a69d /src/amd/compiler/aco_print_ir.cpp | |
parent | ad2902cbbe0c87def5656e081cd9006fc4d74cc9 (diff) |
aco: fix a dynamic-stack-buffer-overflow when printing instructions
Detected by ASAN.
Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Reviewed-by: Timur Kristóf <timur.kristof@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/14329>
Diffstat (limited to 'src/amd/compiler/aco_print_ir.cpp')
-rw-r--r-- | src/amd/compiler/aco_print_ir.cpp | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/src/amd/compiler/aco_print_ir.cpp b/src/amd/compiler/aco_print_ir.cpp index d3b24dc0a57..2498a5b1ce8 100644 --- a/src/amd/compiler/aco_print_ir.cpp +++ b/src/amd/compiler/aco_print_ir.cpp @@ -658,37 +658,38 @@ aco_print_instr(const Instruction* instr, FILE* output, unsigned flags) } fprintf(output, "%s", instr_info.name[(int)instr->opcode]); if (instr->operands.size()) { - bool* const abs = (bool*)alloca(instr->operands.size() * sizeof(bool)); - bool* const neg = (bool*)alloca(instr->operands.size() * sizeof(bool)); - bool* const opsel = (bool*)alloca(instr->operands.size() * sizeof(bool)); - for (unsigned i = 0; i < instr->operands.size(); ++i) { + const unsigned num_operands = instr->operands.size(); + bool* const abs = (bool*)alloca(num_operands * sizeof(bool)); + bool* const neg = (bool*)alloca(num_operands * sizeof(bool)); + bool* const opsel = (bool*)alloca(num_operands * sizeof(bool)); + for (unsigned i = 0; i < num_operands; ++i) { abs[i] = false; neg[i] = false; opsel[i] = false; } if (instr->isVOP3()) { const VOP3_instruction& vop3 = instr->vop3(); - for (unsigned i = 0; i < 3; ++i) { + for (unsigned i = 0; i < MIN2(num_operands, 3); ++i) { abs[i] = vop3.abs[i]; neg[i] = vop3.neg[i]; opsel[i] = vop3.opsel & (1 << i); } } else if (instr->isDPP16()) { const DPP16_instruction& dpp = instr->dpp16(); - for (unsigned i = 0; i < 2; ++i) { + for (unsigned i = 0; i < MIN2(num_operands, 2); ++i) { abs[i] = dpp.abs[i]; neg[i] = dpp.neg[i]; opsel[i] = false; } } else if (instr->isSDWA()) { const SDWA_instruction& sdwa = instr->sdwa(); - for (unsigned i = 0; i < 2; ++i) { + for (unsigned i = 0; i < MIN2(num_operands, 2); ++i) { abs[i] = sdwa.abs[i]; neg[i] = sdwa.neg[i]; opsel[i] = false; } } - for (unsigned i = 0; i < instr->operands.size(); ++i) { + for (unsigned i = 0; i < num_operands; ++i) { if (i) fprintf(output, ", "); else |