diff options
| author | Colin Ian King <colin.king@canonical.com> | 2017-05-19 18:56:17 +0100 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2017-05-19 20:36:32 +0100 |
| commit | 0109808145180d0ed3da05361f80839e6c80caeb (patch) | |
| tree | 142eb1525f66cc4bc39d71dcddcbf208a2e82e33 /drivers/gpu/drm/i915/selftests | |
| parent | 00bd16f257a4cd94305bb6e1c73f7c93c196ffc7 (diff) | |
| download | op-kernel-dev-0109808145180d0ed3da05361f80839e6c80caeb.zip op-kernel-dev-0109808145180d0ed3da05361f80839e6c80caeb.tar.gz | |
drm/i915: Check for allocation failure
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>
Link: http://patchwork.freedesktop.org/patch/msgid/20170519175617.7036-1-colin.king@canonical.com
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Diffstat (limited to 'drivers/gpu/drm/i915/selftests')
| -rw-r--r-- | drivers/gpu/drm/i915/selftests/i915_sw_fence.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/selftests/i915_sw_fence.c b/drivers/gpu/drm/i915/selftests/i915_sw_fence.c index c31d439..19d145d6 100644 --- a/drivers/gpu/drm/i915/selftests/i915_sw_fence.c +++ b/drivers/gpu/drm/i915/selftests/i915_sw_fence.c @@ -123,6 +123,11 @@ 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; |
