From: Lionel Landwerlin Date: Tue, 25 Oct 2016 11:49:52 +0000 (+0100) Subject: intel: aubinator: fix assumptions on amount of required data X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=46d67799a68645609e01ab7c8b48e552ad6e2331;p=mesa.git intel: aubinator: fix assumptions on amount of required data We require 12 bytes of headers but in some cases we just need 4. Signed-off-by: Lionel Landwerlin Reviewed-by: Anuj Phogat --- diff --git a/src/intel/tools/aubinator.c b/src/intel/tools/aubinator.c index 11709c87a71..67f1f0db153 100644 --- a/src/intel/tools/aubinator.c +++ b/src/intel/tools/aubinator.c @@ -946,7 +946,7 @@ 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; - if (file->end - file->cursor < 12) + if (file->end - file->cursor < 1) return AUB_ITEM_DECODE_NEED_MORE_DATA; p = file->cursor; @@ -970,9 +970,13 @@ aub_file_decode_batch(struct aub_file *file, struct gen_spec *spec) 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): + if (file->end - file->cursor < 4) + return AUB_ITEM_DECODE_NEED_MORE_DATA; payload_size = p[4]; break; default: