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

freedreno/drm: Fix mmap leak

Browse source 
In the fd_bo_upload() path, we don't want to trigger duplicate mmap's.

Fixes: 53ccb421a2 ("freedreno/drm: Simplify backend mmap impl")
Signed-off-by: Rob Clark <robdclark@chromium.org>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/26162>
This commit is contained in:
Rob Clark 2023-11-12 11:07:33 -08:00 • committed by Marge Bot
parent 3f3fa5ee0c
commit 3ca5f3bf00
1 changed files with 15 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
src/freedreno/drm/freedreno_bo.c
View file

@ -606,15 +606,9 @@ fd_bo_map_os_mmap(struct fd_bo *bo)
bo->dev->fd, offset);
}
void *
fd_bo_map(struct fd_bo *bo)
static void *
__fd_bo_map(struct fd_bo *bo)
{
/* don't allow mmap'ing something allocated with FD_BO_NOMAP
* for sanity
*/
if (bo->alloc_flags & FD_BO_NOMAP)
return NULL;
if (!bo->map) {
bo->map = bo->funcs->map(bo);
if (bo->map == MAP_FAILED) {
@ -626,6 +620,18 @@ fd_bo_map(struct fd_bo *bo)
return bo->map;
}
void *
fd_bo_map(struct fd_bo *bo)
{
/* don't allow mmap'ing something allocated with FD_BO_NOMAP
* for sanity
*/
if (bo->alloc_flags & FD_BO_NOMAP)
return NULL;
return __fd_bo_map(bo);
}
void
fd_bo_upload(struct fd_bo *bo, void *src, unsigned off, unsigned len)
{
@ -634,7 +640,7 @@ fd_bo_upload(struct fd_bo *bo, void *src, unsigned off, unsigned len)
return;
}
memcpy((uint8_t *)bo->funcs->map(bo) + off, src, len);
memcpy((uint8_t *)__fd_bo_map(bo) + off, src, len);
}
bool