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

lavapipe: do not close import fd on error and amend an error code

Browse source 
The implementation only takes the ownership after a successful import.
On import failure, the caller is going to handle the fd. Meanwhile,
amend a missing error code on an error path.

Fixes: 895d3399f7 ("lavapipe: add support for KHR_external_memory_fd")
Reviewed-by: Lucas Fryzek <lfryzek@igalia.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/36204>
(cherry picked from commit 160cd3a317)
This commit is contained in:
Yiwei Zhang 2025-07-17 20:08:46 -07:00 • committed by Eric Engestrom
parent 2f74be6233
commit 55071f8bb1
2 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.pick_status.json
View file

@ -5524,7 +5524,7 @@
"description": "lavapipe: do not close import fd on error and amend an error code",
"nominated": true,
"nomination_type": 2,
"resolution": 0,
"resolution": 1,
"main_sha": null,
"because_sha": "895d3399f7fb5cf58aa857fb2b98f23fe89071ba",
"notes": null

3
src/gallium/frontends/lavapipe/lvp_device.c
View file

@ -2002,13 +2002,12 @@ VKAPI_ATTR VkResult VKAPI_CALL lvp_AllocateMemory(
bool dmabuf = import_info->handleType == VK_EXTERNAL_MEMORY_HANDLE_TYPE_DMA_BUF_BIT_EXT;
uint64_t size;
if(!device->pscreen->import_memory_fd(device->pscreen, import_info->fd, &mem->pmem, &size, dmabuf)) {
close(import_info->fd);
error = VK_ERROR_INVALID_EXTERNAL_HANDLE;
goto fail;
}
if(size < pAllocateInfo->allocationSize) {
device->pscreen->free_memory_fd(device->pscreen, mem->pmem);
close(import_info->fd);
error = VK_ERROR_INVALID_EXTERNAL_HANDLE;
goto fail;
}
if (export_info && export_info->handleTypes == import_info->handleType) {