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

panvk: Fix IUB decode

Browse source 
The buffer is only an IUB if it's within the size of the resource entry.
Otherwise, it might just be a buffer that landed just after the
descriptor allocation.

Fixes: fb38f10240 ("panvk: Handle IUBs in decoder")
Reviewed-by: Christoph Pillmayer <christoph.pillmayer@arm.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/36519>
This commit is contained in:
Lars-Ivar Hesselberg Simonsen 2025-08-05 13:29:40 +02:00 • committed by Marge Bot
parent e5b828e808
commit db4bcd48d7
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/panfrost/genxml/decode.c
View file

@ -565,14 +565,16 @@ GENX(pandecode_shader)(struct pandecode_context *ctx, uint64_t addr,
static unsigned static unsigned
pandecode_buffer(struct pandecode_context *ctx, pandecode_buffer(struct pandecode_context *ctx,
const struct mali_buffer_packed *cl, uint64_t addr) const struct mali_buffer_packed *cl, uint64_t addr,
uint64_t entry_size)
{ {
pan_unpack(cl, BUFFER, buffer) pan_unpack(cl, BUFFER, buffer)
; ;
DUMP_UNPACKED(ctx, BUFFER, buffer, "Buffer @%" PRIx64 ":\n", addr); DUMP_UNPACKED(ctx, BUFFER, buffer, "Buffer @%" PRIx64 ":\n", addr);
/* If the address is the following descriptor, this descriptor is an IUB. */ /* If the address is the following descriptor and is within the resource
if (buffer.address == (addr + 0x20)) { * entry, this descriptor is an IUB. */
if (buffer.address == (addr + 0x20) && buffer.address < addr + entry_size) {
assert((buffer.size % 0x20) == 0); assert((buffer.size % 0x20) == 0);
const uint8_t *cl_bytes = (uint8_t *)cl; const uint8_t *cl_bytes = (uint8_t *)cl;
@ -621,7 +623,7 @@ pandecode_resources(struct pandecode_context *ctx, uint64_t addr, unsigned size)
break; break;
case MALI_DESCRIPTOR_TYPE_BUFFER: case MALI_DESCRIPTOR_TYPE_BUFFER:
i += pandecode_buffer(ctx, (const struct mali_buffer_packed *)&cl[i], i += pandecode_buffer(ctx, (const struct mali_buffer_packed *)&cl[i],
addr + i); addr + i, size);
break; break;
default: default:
fprintf(ctx->dump_stream, "Unknown descriptor type %X\n", header.type); fprintf(ctx->dump_stream, "Unknown descriptor type %X\n", header.type);