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

intel/aubinator: Trust the packet size in the header for SUBOPCODE_HEADER

Browse source 
We were reading from the "comment size" dword and incrementing by that
amount.  This never caused a problem because that field was always zero.
However, experimenting with actual aub file comments indicates, the
simulator seems to include the comment size in the packet size provided in
the header.  We should do the same.

Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Reviewed-by: Jordan Justen <jordan.l.justen@intel.com>
This commit is contained in:
Jason Ekstrand 2016-11-23 19:26:13 -08:00
parent 89bb515e91
commit 12f2eae7e7
1 changed files with 4 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/intel/tools/aubinator.c
View file

@ -993,7 +993,7 @@ static int
aub_file_decode_batch(struct aub_file *file, struct gen_spec *spec)
{
uint32_t *p, h, device, data_type, *new_cursor;
int header_length, payload_size, bias;
int header_length, bias;
if (file->end - file->cursor < 1)
return AUB_ITEM_DECODE_NEED_MORE_DATA;
@ -1016,23 +1016,13 @@ aub_file_decode_batch(struct aub_file *file, struct gen_spec *spec)
return AUB_ITEM_DECODE_FAILED;
}
payload_size = 0;
switch (h & 0xffff0000) {
case MAKE_HEADER(TYPE_AUB, OPCODE_AUB, SUBOPCODE_HEADER):
if (file->end - file->cursor < 12)
return AUB_ITEM_DECODE_NEED_MORE_DATA;
payload_size = p[12];
break;
case MAKE_HEADER(TYPE_AUB, OPCODE_AUB, SUBOPCODE_BLOCK):
new_cursor = p + header_length + bias;
if ((h & 0xffff0000) == MAKE_HEADER(TYPE_AUB, OPCODE_AUB, SUBOPCODE_BLOCK)) {
if (file->end - file->cursor < 4)
return AUB_ITEM_DECODE_NEED_MORE_DATA;
payload_size = p[4];
break;
default:
break;
new_cursor += p[4] / 4;
}
new_cursor = p + header_length + bias + payload_size / 4;
if (new_cursor > file->end)
return AUB_ITEM_DECODE_NEED_MORE_DATA;