OSDN Git Service
(root)
/
tomoyo
/
tomoyo-test1.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
70cc779
)
drm/panfrost: Fix a BO leak in panfrost_ioctl_mmap_bo()
author
Boris Brezillon
<boris.brezillon@collabora.com>
Fri, 29 Nov 2019 13:59:03 +0000
(14:59 +0100)
committer
Rob Herring
<robh@kernel.org>
Fri, 6 Dec 2019 17:06:11 +0000
(11:06 -0600)
We should release the reference we grabbed when an error occurs.
Fixes:
187d2929206e
("drm/panfrost: Add support for GPU heap allocations")
Cc: <stable@vger.kernel.org>
Signed-off-by: Boris Brezillon <boris.brezillon@collabora.com>
Reviewed-by: Steven Price <steven.price@arm.com>
Acked-by: Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com>
Signed-off-by: Rob Herring <robh@kernel.org>
Link:
https://patchwork.freedesktop.org/patch/msgid/20191129135908.2439529-4-boris.brezillon@collabora.com
drivers/gpu/drm/panfrost/panfrost_drv.c
patch
|
blob
|
history
diff --git
a/drivers/gpu/drm/panfrost/panfrost_drv.c
b/drivers/gpu/drm/panfrost/panfrost_drv.c
index
8b8d654
..
0a5d820
100644
(file)
--- a/
drivers/gpu/drm/panfrost/panfrost_drv.c
+++ b/
drivers/gpu/drm/panfrost/panfrost_drv.c
@@
-303,14
+303,17
@@
static int panfrost_ioctl_mmap_bo(struct drm_device *dev, void *data,
}
/* Don't allow mmapping of heap objects as pages are not pinned. */
- if (to_panfrost_bo(gem_obj)->is_heap)
- return -EINVAL;
+ if (to_panfrost_bo(gem_obj)->is_heap) {
+ ret = -EINVAL;
+ goto out;
+ }
ret = drm_gem_create_mmap_offset(gem_obj);
if (ret == 0)
args->offset = drm_vma_node_offset_addr(&gem_obj->vma_node);
- drm_gem_object_put_unlocked(gem_obj);
+out:
+ drm_gem_object_put_unlocked(gem_obj);
return ret;
}