fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-07 15:48:36 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

panfrost: do not deref potentially null pointer

Browse source 
We need to check for failure to import *before* we dereference here.

Fixes: f94889d079 ("panfrost: Make pan_texture.{c,h} panfrost_bo agnostic")
CID: 1587376
Reviewed-by: Boris Brezillon <boris.brezillon@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/28856>
(cherry picked from commit 8deaf37047)
This commit is contained in:
Erik Faye-Lund 2024-04-22 13:29:13 +02:00 • committed by Eric Engestrom
parent 926715dcb8
commit afb24c6612
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.pick_status.json
View file

@ -1014,7 +1014,7 @@
"description": "panfrost: do not deref potentially null pointer",
"nominated": true,
"nomination_type": 1,
"resolution": 0,
"resolution": 1,
"main_sha": null,
"because_sha": "f94889d0797f6dc66b7875e68ae7d44c0f018131",
"notes": null

3
src/gallium/drivers/panfrost/pan_resource.c
View file

@ -725,13 +725,14 @@ panfrost_resource_create_with_modifier(struct pipe_screen *screen,
}
assert(handle.type == WINSYS_HANDLE_TYPE_FD);
so->bo = panfrost_bo_import(dev, handle.handle);
so->image.data.base = so->bo->ptr.gpu;
close(handle.handle);
if (!so->bo) {
free(so);
return NULL;
}
so->image.data.base = so->bo->ptr.gpu;
} else {
/* We create a BO immediately but don't bother mapping, since we don't
* care to map e.g. FBOs which the CPU probably won't touch */