]> git.baikalelectronics.ru Git - kernel.git/commitdiff
drm/i915: Fix error pointer dereference in i915_gem_do_execbuffer()
authorDan Carpenter <dan.carpenter@oracle.com>
Thu, 2 Dec 2021 04:48:31 +0000 (20:48 -0800)
committerRodrigo Vivi <rodrigo.vivi@intel.com>
Wed, 8 Dec 2021 17:44:26 +0000 (12:44 -0500)
Originally "out_fence" was set using out_fence = sync_file_create() but
which returns NULL, but now it is set with out_fence = eb_requests_create()
which returns error pointers.  The error path needs to be modified to
avoid an Oops in the "goto err_request;" path.

Fixes: 544460c33821 ("drm/i915: Multi-BB execbuf")
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Matthew Brost <matthew.brost@intel.com>
Reviewed-by: Matthew Brost <matthew.brost@intel.com>
Signed-off-by: John Harrison <John.C.Harrison@Intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20211202044831.29583-1-matthew.brost@intel.com
(cherry picked from commit 8722ded49ce8a0c706b373e8087eb810684962ff)
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c

index 4d7da07442f2a274620bf2b7bd4915e524918f25..9b24d9b5ade1f750d8e87c72e7f592c610f531c6 100644 (file)
@@ -3277,6 +3277,7 @@ i915_gem_do_execbuffer(struct drm_device *dev,
        out_fence = eb_requests_create(&eb, in_fence, out_fence_fd);
        if (IS_ERR(out_fence)) {
                err = PTR_ERR(out_fence);
+               out_fence = NULL;
                if (eb.requests[0])
                        goto err_request;
                else