diff options
| author | Eric Anholt <eric@anholt.net> | 2017-03-01 10:56:02 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-06-24 07:11:14 +0200 |
| commit | 879d61f218a94afdc53a050e97c59209b64687c4 (patch) | |
| tree | e70616b29f1421660f97130b642d7b219f78194b | |
| parent | 5899b635ecc7a8c4ae5007f2e74250ec4297feba (diff) | |
| download | linux-stable-879d61f218a94afdc53a050e97c59209b64687c4.tar.gz linux-stable-879d61f218a94afdc53a050e97c59209b64687c4.tar.bz2 linux-stable-879d61f218a94afdc53a050e97c59209b64687c4.zip | |
drm/vc4: Fix OOPSes from trying to cache a partially constructed BO.
commit ca39b449f6d03e8235969f12f5dd25b8eb4304d6 upstream.
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
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -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 3f6704cf6608..ec9023bd935b 100644 --- a/drivers/gpu/drm/vc4/vc4_bo.c +++ b/drivers/gpu/drm/vc4/vc4_bo.c @@ -313,6 +313,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); |