diff options
| author |   John Harrison <John.C.Harrison@Intel.com> | 2023-08-02 11:49:40 -0700 |
|---|---|---|
| committer | John Harrison <John.C.Harrison@Intel.com> | 2023-08-10 16:02:01 -0700 |
| commit | 788568fad4015406fa84fc86cefbef7c470c7c1f (patch) | |
| tree | 89ce6fa7c8ce60024817e4fae081157968fa2ff1 | |
| parent | drm/i915/gt: Apply workaround 22016122933 correctly (diff) | |
| download | linux-rng-788568fad4015406fa84fc86cefbef7c470c7c1f.tar.xz linux-rng-788568fad4015406fa84fc86cefbef7c470c7c1f.zip | |
drm/i915/guc: Fix potential null pointer deref in GuC 'steal id' test
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
| -rw-r--r-- | drivers/gpu/drm/i915/gt/uc/selftest_guc.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/gpu/drm/i915/gt/uc/selftest_guc.c b/drivers/gpu/drm/i915/gt/uc/selftest_guc.c index 1fd760539f77..bfb72143566f 100644 --- a/drivers/gpu/drm/i915/gt/uc/selftest_guc.c +++ b/drivers/gpu/drm/i915/gt/uc/selftest_guc.c @@ -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 { |