fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-24 21:50:12 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

panvk: Fix IUB decode

Browse source 
The base address used for bounds checking the entry was wrong. Directly
pass the end_of_entry address instead.

Fixes: db4bcd48d7 ("panvk: Fix IUB decode")
Reviewed-by: Erik Faye-Lund <erik.faye-lund@collabora.com>
Reviewed-by: Boris Brezillon <boris.brezillon@collabora.com>
(cherry picked from commit 89293120f0)

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/38432>
This commit is contained in:
Lars-Ivar Hesselberg Simonsen 2025-11-04 14:40:03 +01:00 • committed by Dylan Baker
parent d48e4a3f3b
commit 1460a0319f
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.pick_status.json
View file

@ -1994,7 +1994,7 @@
"description": "panvk: Fix IUB decode",
"nominated": true,
"nomination_type": 2,
"resolution": 0,
"resolution": 1,
"main_sha": null,
"because_sha": "db4bcd48d7a6a775aad608686b865ef584a31861",
"notes": null

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

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