diff options
| author | Eric Anholt <eric@anholt.net> | 2017-03-01 10:56:02 -0800 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2017-03-02 09:57:23 -0800 |
| commit | ca39b449f6d03e8235969f12f5dd25b8eb4304d6 (patch) | |
| tree | 0d52635405c7786cf537ec21a728d4830bc2edad | |
| parent | eb981383ff74f109c72c8c94f4d63705d51cba20 (diff) | |
drm/vc4: Fix OOPSes from trying to cache a partially constructed BO.drm-misc-next-2017-03-06
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: Eric Anholt <eric@anholt.net>
Fixes: c826a6e10644 ("drm/vc4: Add a BO cache.")
Reviewed-by: Boris Brezillon <boris.brezillon@free-electrons.com>
Link: http://patchwork.freedesktop.org/patch/msgid/20170301185602.6873-2-eric@anholt.net
| -rw-r--r-- | drivers/gpu/drm/vc4/vc4_bo.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/drivers/gpu/drm/vc4/vc4_bo.c b/drivers/gpu/drm/vc4/vc4_bo.c index e5c7aa935b4b..af29432a6471 100644 --- a/drivers/gpu/drm/vc4/vc4_bo.c +++ b/drivers/gpu/drm/vc4/vc4_bo.c @@ -317,6 +317,14 @@ void vc4_free_object(struct drm_gem_object *gem_bo) 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); if (!cache_list) { vc4_bo_destroy(bo); |