2020-07-13 14:28:45

by Colin King

Subject: [PATCH][next] drm/i915/selftest: fix an error return path where err is not being set

From: Colin Ian King <[email protected]>

There is an error condition where err is not being set and an uninitialized
garbage value in err is being returned. Fix this by assigning err to an
appropriate error return value before taking the error exit path.

Addresses-Coverity: ("Uninitialized scalar value")
Fixes: ed2690a9ca89 ("drm/i915/selftest: Check that GPR are restored across noa_wait")
Signed-off-by: Colin Ian King <[email protected]>
---
drivers/gpu/drm/i915/selftests/i915_perf.c | 1 +
1 file changed, 1 insertion(+)

diff --git a/drivers/gpu/drm/i915/selftests/i915_perf.c b/drivers/gpu/drm/i915/selftests/i915_perf.c
index deb6dec1b5ab..7aa73bb03381 100644
--- a/drivers/gpu/drm/i915/selftests/i915_perf.c
+++ b/drivers/gpu/drm/i915/selftests/i915_perf.c
@@ -329,6 +329,7 @@ static int live_noa_gpr(void *arg)
cs = intel_ring_begin(rq, 2 * 32 + 2);
if (IS_ERR(cs)) {
i915_request_add(rq);
+ err = PTR_ERR(cs);
goto out_rq;
}

--
2.27.0

2020-07-13 15:06:31

by Chris Wilson

Subject: Re: [PATCH][next] drm/i915/selftest: fix an error return path where err is not being set

Quoting Colin King (2020-07-13 15:25:51)
> From: Colin Ian King <[email protected]>
>
> There is an error condition where err is not being set and an uninitialized
> garbage value in err is being returned. Fix this by assigning err to an
> appropriate error return value before taking the error exit path.
>
> Addresses-Coverity: ("Uninitialized scalar value")
> Fixes: ed2690a9ca89 ("drm/i915/selftest: Check that GPR are restored across noa_wait")
> Signed-off-by: Colin Ian King <[email protected]>

Thanks, pushed.
-Chris