drm/i915/selftests: Change mock_request() to return error pointers

[ Upstream commit caa7c7a76b78ce41d347003f84975125383e6b59 ]

There was an error pointer vs NULL bug in __igt_breadcrumbs_smoketest().
The __mock_request_alloc() function implements the
smoketest->request_alloc() function pointer.  It was supposed to return
error pointers, but it propogates the NULL return from mock_request()
so in the event of a failure, it would lead to a NULL pointer
dereference.

To fix this, change the mock_request() function to return error pointers
and update all the callers to expect that.

Fixes: 52c0fdb25c7c ("drm/i915: Replace global breadcrumbs with per-context interrupt tracking")
Signed-off-by: Dan Carpenter <dan.carpenter@linaro.org>
Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Link: https://lore.kernel.org/r/685c1417.050a0220.696f5.5c05@mx.google.com
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
(cherry picked from commit 778fa8ad5f0f23397d045c7ebca048ce8def1c43)
Signed-off-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/gpu/drm/i915/selftests/i915_request.c b/drivers/gpu/drm/i915/selftests/i915_request.c
index b3688543ed7d043d2c899c3c6a38b37e9f95caac..6ee24f2061616352ef7819e7978cdc9f5cff7230 100644 (file)
--- a/drivers/gpu/drm/i915/selftests/i915_request.c
+++ b/drivers/gpu/drm/i915/selftests/i915_request.c
@@ -47,8 +47,10 @@ static int igt_add_request(void *arg)
 
        mutex_lock(&i915->drm.struct_mutex);
        request = mock_request(i915->engine[RCS0]->kernel_context, HZ / 10);
-       if (!request)
+       if (IS_ERR(request)) {
+               err = PTR_ERR(request);
                goto out_unlock;
+       }
 
        i915_request_add(request);
 
@@ -69,8 +71,8 @@ static int igt_wait_request(void *arg)
 
        mutex_lock(&i915->drm.struct_mutex);
        request = mock_request(i915->engine[RCS0]->kernel_context, T);
-       if (!request) {
-               err = -ENOMEM;
+       if (IS_ERR(request)) {
+               err = PTR_ERR(request);
                goto out_unlock;
        }
        i915_request_get(request);
@@ -142,8 +144,8 @@ static int igt_fence_wait(void *arg)
 
        mutex_lock(&i915->drm.struct_mutex);
        request = mock_request(i915->engine[RCS0]->kernel_context, T);
-       if (!request) {
-               err = -ENOMEM;
+       if (IS_ERR(request)) {
+               err = PTR_ERR(request);
                goto out_locked;
        }
 
@@ -203,8 +205,8 @@ static int igt_request_rewind(void *arg)
        GEM_BUG_ON(IS_ERR(ce));
        request = mock_request(ce, 2 * HZ);
        intel_context_put(ce);
-       if (!request) {
-               err = -ENOMEM;
+       if (IS_ERR(request)) {
+               err = PTR_ERR(request);
                goto err_context_0;
        }
 
@@ -216,8 +218,8 @@ static int igt_request_rewind(void *arg)
        GEM_BUG_ON(IS_ERR(ce));
        vip = mock_request(ce, 0);
        intel_context_put(ce);
-       if (!vip) {
-               err = -ENOMEM;
+       if (IS_ERR(vip)) {
+               err = PTR_ERR(vip);
                goto err_context_1;
        }
 

diff --git a/drivers/gpu/drm/i915/selftests/mock_request.c b/drivers/gpu/drm/i915/selftests/mock_request.c
index 09f747228dff575a1fd7684cc8d348b949fc9b64..1b0cf073e9643ff4569d45ffaac91644800f81ab 100644 (file)
--- a/drivers/gpu/drm/i915/selftests/mock_request.c
+++ b/drivers/gpu/drm/i915/selftests/mock_request.c
@@ -35,7 +35,7 @@ mock_request(struct intel_context *ce, unsigned long delay)
        /* NB the i915->requests slab cache is enlarged to fit mock_request */
        request = intel_context_create_request(ce);
        if (IS_ERR(request))
-               return NULL;
+               return request;
 
        request->mock.delay = delay;
        return request;