fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-01-06 13:10:10 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

aco: fix a dynamic-stack-buffer-overflow when printing instructions

Browse source 
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>
This commit is contained in:
Samuel Pitoiset 2021-12-29 08:28:22 +01:00
parent ad2902cbbe
commit 3ef736c94e
1 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/amd/compiler/aco_print_ir.cpp
View file

@ -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