|
 |
e93be63 |
From patchwork Thu Feb 9 18:16:00 2017
|
|
|
e93be63 |
Content-Type: text/plain; charset="utf-8"
|
|
|
e93be63 |
MIME-Version: 1.0
|
|
|
e93be63 |
Content-Transfer-Encoding: 7bit
|
|
|
e93be63 |
Subject: drm/vc4: Fix OOPSes from trying to cache a partially constructed BO.
|
|
|
e93be63 |
From: Eric Anholt <eric@anholt.net>
|
|
|
e93be63 |
X-Patchwork-Id: 138087
|
|
|
e93be63 |
Message-Id: <20170209181600.24048-1-eric@anholt.net>
|
|
|
e93be63 |
To: dri-devel@lists.freedesktop.org
|
|
|
e93be63 |
Cc: linux-kernel@vger.kernel.org, pbrobinson@gmail.com
|
|
|
e93be63 |
Date: Thu, 9 Feb 2017 10:16:00 -0800
|
|
|
e93be63 |
|
|
|
e93be63 |
If a CMA allocation failed, the partially constructed BO would be
|
|
|
e93be63 |
unreferenced through the normal path, and we might choose to put it in
|
|
|
e93be63 |
the BO cache. If we then reused it before it expired from the cache,
|
|
|
e93be63 |
the kernel would OOPS.
|
|
|
e93be63 |
|
|
|
e93be63 |
Signed-off-by: Eric Anholt <eric@anholt.net>
|
|
|
e93be63 |
Fixes: c826a6e10644 ("drm/vc4: Add a BO cache.")
|
|
|
e93be63 |
---
|
|
|
e93be63 |
drivers/gpu/drm/vc4/vc4_bo.c | 8 ++++++++
|
|
|
e93be63 |
1 file changed, 8 insertions(+)
|
|
|
e93be63 |
|
|
|
e93be63 |
diff --git a/drivers/gpu/drm/vc4/vc4_bo.c b/drivers/gpu/drm/vc4/vc4_bo.c
|
|
|
e93be63 |
index 5ec14f25625d..fd83a2807656 100644
|
|
|
e93be63 |
--- a/drivers/gpu/drm/vc4/vc4_bo.c
|
|
|
e93be63 |
+++ b/drivers/gpu/drm/vc4/vc4_bo.c
|
|
|
e93be63 |
@@ -314,6 +314,14 @@ void vc4_free_object(struct drm_gem_object *gem_bo)
|
|
|
e93be63 |
goto out;
|
|
|
e93be63 |
}
|
|
|
e93be63 |
|
|
|
e93be63 |
+ /* If this object was partially constructed but CMA allocation
|
|
|
e93be63 |
+ * had failed, just free it.
|
|
|
e93be63 |
+ */
|
|
|
e93be63 |
+ if (!bo->base.vaddr) {
|
|
|
e93be63 |
+ vc4_bo_destroy(bo);
|
|
|
e93be63 |
+ goto out;
|
|
|
e93be63 |
+ }
|
|
|
e93be63 |
+
|
|
|
e93be63 |
cache_list = vc4_get_cache_list_for_size(dev, gem_bo->size);
|
|
|
e93be63 |
if (!cache_list) {
|
|
|
e93be63 |
vc4_bo_destroy(bo);
|