Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]


Groups > linux.kernel > #1645798 > unrolled thread

[PATCH][drm-next] drm/i915: Check for allocation failure

Started byColin King <colin.king@canonical.com>
First post2017-05-19 20:00 +0200
Last post2017-05-19 21:40 +0200
Articles 2 — 2 participants

Back to article view | Back to linux.kernel


Contents

  [PATCH][drm-next] drm/i915: Check for allocation failure Colin King <colin.king@canonical.com> - 2017-05-19 20:00 +0200
    Re: [PATCH][drm-next] drm/i915: Check for allocation failure Chris Wilson <chris@chris-wilson.co.uk> - 2017-05-19 21:40 +0200

#1645798 — [PATCH][drm-next] drm/i915: Check for allocation failure

FromColin King <colin.king@canonical.com>
Date2017-05-19 20:00 +0200
Subject[PATCH][drm-next] drm/i915: Check for allocation failure
Message-ID<tIUlX-5uX-5@gated-at.bofh.it>
From: Colin Ian King <colin.king@canonical.com>

The memory allocation for C is not being null checked and hence we
could end up with a null pointer dereference. Fix this with a null
pointer check. (I really should have noticed this when I was fixing an
earlier issue.)

Detected by CoverityScan, CID#1436406 ("Dereference null return")

Fixes: 47624cc3301b60 ("drm/i915: Import the kfence selftests for i915_sw_fence")
Signed-off-by: Colin Ian King <colin.king@canonical.com>
---
 drivers/gpu/drm/i915/selftests/i915_sw_fence.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/drivers/gpu/drm/i915/selftests/i915_sw_fence.c b/drivers/gpu/drm/i915/selftests/i915_sw_fence.c
index c31d439fae3a..33128be77bbe 100644
--- a/drivers/gpu/drm/i915/selftests/i915_sw_fence.c
+++ b/drivers/gpu/drm/i915/selftests/i915_sw_fence.c
@@ -123,6 +123,10 @@ static int test_dag(void *arg)
 	}
 
 	C = alloc_fence();
+	if (!C) {
+		ret = -ENOMEM;
+		goto err_B;
+	}
 	if (i915_sw_fence_await_sw_fence_gfp(B, C, GFP_KERNEL) == -EINVAL) {
 		pr_err("invalid cycle detected\n");
 		goto err_C;
-- 
2.11.0

[toc] | [next] | [standalone]


#1645867

FromChris Wilson <chris@chris-wilson.co.uk>
Date2017-05-19 21:40 +0200
Message-ID<tIVUJ-6R6-9@gated-at.bofh.it>
In reply to#1645798
On Fri, May 19, 2017 at 06:56:17PM +0100, Colin King wrote:
> From: Colin Ian King <colin.king@canonical.com>
> 
> The memory allocation for C is not being null checked and hence we
> could end up with a null pointer dereference. Fix this with a null
> pointer check. (I really should have noticed this when I was fixing an
> earlier issue.)
> 
> Detected by CoverityScan, CID#1436406 ("Dereference null return")
> 
> Fixes: 47624cc3301b60 ("drm/i915: Import the kfence selftests for i915_sw_fence")
> Signed-off-by: Colin Ian King <colin.king@canonical.com>

Pushed, thanks very much for the patch.
-Chris

-- 
Chris Wilson, Intel Open Source Technology Centre

[toc] | [prev] | [standalone]


Back to top | Article view | linux.kernel


csiph-web