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

amdgpu: free flink bo in bo import

Browse source 
Fix potential memory leak when handle flink bo in bo import.
Free the flink bo after bo import and in error handling.

Signed-off-by: Junwei Zhang <Jerry.Zhang@amd.com>
Reviewed-by: Christian König <christian.koenig@amd.com>
This commit is contained in:
Junwei Zhang 2018-08-14 11:00:08 +08:00 • committed by Christian König
parent c6493f360e
commit 3d8b6ea664
1 changed files with 5 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
amdgpu/amdgpu_bo.c
View file

@ -255,6 +255,7 @@ int amdgpu_bo_import(amdgpu_device_handle dev,
struct amdgpu_bo_import_result *output)
{
struct drm_gem_open open_arg = {};
struct drm_gem_close close_arg = {};
struct amdgpu_bo *bo = NULL;
int r;
int dma_fd;
@ -342,15 +343,19 @@ int amdgpu_bo_import(amdgpu_device_handle dev,
bo->handle = open_arg.handle;
if (dev->flink_fd != dev->fd) {
close_arg.handle = open_arg.handle;
r = drmPrimeHandleToFD(dev->flink_fd, bo->handle, DRM_CLOEXEC, &dma_fd);
if (r) {
free(bo);
drmIoctl(dev->flink_fd, DRM_IOCTL_GEM_CLOSE,
&close_arg);
pthread_mutex_unlock(&dev->bo_table_mutex);
return r;
}
r = drmPrimeFDToHandle(dev->fd, dma_fd, &bo->handle );
close(dma_fd);
drmIoctl(dev->flink_fd, DRM_IOCTL_GEM_CLOSE, &close_arg);
if (r) {
free(bo);