]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
drm/i915/guc: Fix potential null pointer deref in GuC 'steal id' test
authorJohn Harrison <John.C.Harrison@Intel.com>
Wed, 2 Aug 2023 18:49:40 +0000 (11:49 -0700)
committerJohn Harrison <John.C.Harrison@Intel.com>
Thu, 10 Aug 2023 23:02:01 +0000 (16:02 -0700)
It was noticed that if the very first 'stealing' request failed to
create for some reason then the 'steal all ids' loop would immediately
exit with 'last' still being NULL. The test would attempt to continue
but using a null pointer. Fix that by aborting the test if it fails to
create any requests at all.

Signed-off-by: John Harrison <John.C.Harrison@Intel.com>
Reviewed-by: Andi Shyti <andi.shyti@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20230802184940.911753-1-John.C.Harrison@Intel.com
drivers/gpu/drm/i915/gt/uc/selftest_guc.c

index 1fd760539f77bc67835288c484eaf62412524056..bfb72143566f6e1b7591e8ad5aff8a18a99dc73b 100644 (file)
@@ -204,9 +204,9 @@ static int intel_guc_steal_guc_ids(void *arg)
                if (IS_ERR(rq)) {
                        ret = PTR_ERR(rq);
                        rq = NULL;
-                       if (ret != -EAGAIN) {
-                               guc_err(guc, "Failed to create request %d: %pe\n",
-                                       context_index, ERR_PTR(ret));
+                       if ((ret != -EAGAIN) || !last) {
+                               guc_err(guc, "Failed to create %srequest %d: %pe\n",
+                                       last ? "" : "first ", context_index, ERR_PTR(ret));
                                goto err_spin_rq;
                        }
                } else {