drm/i915/selftests: fix smatch warning in mock_reserve
authorMatthew Auld <matthew.auld@intel.com>
Fri, 2 Jul 2021 10:46:42 +0000 (11:46 +0100)
committerMatthew Auld <matthew.auld@intel.com>
Wed, 7 Jul 2021 08:52:53 +0000 (09:52 +0100)
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
drivers/gpu/drm/i915/selftests/intel_memory_region.c

index 1aaccb9..418caae 100644 (file)
@@ -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;
 }