aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/i915/selftests
diff options
context:
space:
mode:
authorMatthew Auld <matthew.auld@intel.com>2021-07-02 11:46:42 +0100
committerMatthew Auld <matthew.auld@intel.com>2021-07-07 09:52:53 +0100
commitb23228f287bc7dd970fed85f15ea4630b93fc8a0 (patch)
tree150a02abe45427ec8e2ed9ce2a163db160b0437c /drivers/gpu/drm/i915/selftests
parentdrm/i915/selftests: fix smatch warning in igt_check_blocks (diff)
downloadlinux-dev-b23228f287bc7dd970fed85f15ea4630b93fc8a0.tar.xz
linux-dev-b23228f287bc7dd970fed85f15ea4630b93fc8a0.zip
drm/i915/selftests: fix smatch warning in mock_reserve
If mock_region_create fails then mem will be an error pointer. Instead we just need to use the correct ordering for the onion unwind. igt_mock_reserve() error: 'mem' dereferencing possible ERR_PTR() Reported-by: kernel test robot <lkp@intel.com> Reported-by: Dan Carpenter <dan.carpenter@oracle.com> Signed-off-by: Matthew Auld <matthew.auld@intel.com> Reviewed-by: Ramalingam C <ramalingam.c@intel.com> Link: https://patchwork.freedesktop.org/patch/msgid/20210702104642.1189978-2-matthew.auld@intel.com
Diffstat (limited to 'drivers/gpu/drm/i915/selftests')
-rw-r--r--drivers/gpu/drm/i915/selftests/intel_memory_region.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/gpu/drm/i915/selftests/intel_memory_region.c b/drivers/gpu/drm/i915/selftests/intel_memory_region.c
index 1aaccb9841a0..418caae84759 100644
--- a/drivers/gpu/drm/i915/selftests/intel_memory_region.c
+++ b/drivers/gpu/drm/i915/selftests/intel_memory_region.c
@@ -173,7 +173,7 @@ static int igt_mock_reserve(void *arg)
if (IS_ERR(mem)) {
pr_err("failed to create memory region\n");
err = PTR_ERR(mem);
- goto out_close;
+ goto out_free_order;
}
/* Reserve a bunch of ranges within the region */
@@ -224,9 +224,10 @@ static int igt_mock_reserve(void *arg)
}
out_close:
- kfree(order);
close_objects(mem, &objects);
intel_memory_region_put(mem);
+out_free_order:
+ kfree(order);
return err;
}