Commit ca39b449 authored by Eric Anholt's avatar Eric Anholt

drm/vc4: Fix OOPSes from trying to cache a partially constructed BO.

If a CMA allocation failed, the partially constructed BO would be
unreferenced through the normal path, and we might choose to put it in
the BO cache.  If we then reused it before it expired from the cache,
the kernel would OOPS.
Signed-off-by: default avatarEric Anholt <eric@anholt.net>
Fixes: c826a6e1 ("drm/vc4: Add a BO cache.")
Reviewed-by: default avatarBoris Brezillon <boris.brezillon@free-electrons.com>
Link: http://patchwork.freedesktop.org/patch/msgid/20170301185602.6873-2-eric@anholt.net
parent eb981383
...@@ -317,6 +317,14 @@ void vc4_free_object(struct drm_gem_object *gem_bo) ...@@ -317,6 +317,14 @@ void vc4_free_object(struct drm_gem_object *gem_bo)
goto out; goto out;
} }
/* If this object was partially constructed but CMA allocation
* had failed, just free it.
*/
if (!bo->base.vaddr) {
vc4_bo_destroy(bo);
goto out;
}
cache_list = vc4_get_cache_list_for_size(dev, gem_bo->size); cache_list = vc4_get_cache_list_for_size(dev, gem_bo->size);
if (!cache_list) { if (!cache_list) {
vc4_bo_destroy(bo); vc4_bo_destroy(bo);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment