]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
drm/xe/sync: Cleanup partially initialized sync on parse failure
authorShuicheng Lin <shuicheng.lin@intel.com>
Thu, 19 Feb 2026 23:35:18 +0000 (23:35 +0000)
committerMatthew Brost <matthew.brost@intel.com>
Fri, 20 Feb 2026 18:49:07 +0000 (10:49 -0800)
xe_sync_entry_parse() can allocate references (syncobj, fence, chain fence,
or user fence) before hitting a later failure path. Several of those paths
returned directly, leaving partially initialized state and leaking refs.

Route these error paths through a common free_sync label and call
xe_sync_entry_cleanup(sync) before returning the error.

Fixes: dd08ebf6c352 ("drm/xe: Introduce a new DRM driver for Intel GPUs")
Cc: Matthew Brost <matthew.brost@intel.com>
Signed-off-by: Shuicheng Lin <shuicheng.lin@intel.com>
Reviewed-by: Matthew Brost <matthew.brost@intel.com>
Signed-off-by: Matthew Brost <matthew.brost@intel.com>
Link: https://patch.msgid.link/20260219233516.2938172-5-shuicheng.lin@intel.com
drivers/gpu/drm/xe/xe_sync.c

index c8fdcdbd6ae75d3082d3ce7f48d077f1c524c692..f03ab2e27284d3e6722c695375f6efb46fa9dd8d 100644 (file)
@@ -146,8 +146,10 @@ int xe_sync_entry_parse(struct xe_device *xe, struct xe_file *xef,
 
                if (!signal) {
                        sync->fence = drm_syncobj_fence_get(sync->syncobj);
-                       if (XE_IOCTL_DBG(xe, !sync->fence))
-                               return -EINVAL;
+                       if (XE_IOCTL_DBG(xe, !sync->fence)) {
+                               err = -EINVAL;
+                               goto free_sync;
+                       }
                }
                break;
 
@@ -167,17 +169,21 @@ int xe_sync_entry_parse(struct xe_device *xe, struct xe_file *xef,
 
                if (signal) {
                        sync->chain_fence = dma_fence_chain_alloc();
-                       if (!sync->chain_fence)
-                               return -ENOMEM;
+                       if (!sync->chain_fence) {
+                               err = -ENOMEM;
+                               goto free_sync;
+                       }
                } else {
                        sync->fence = drm_syncobj_fence_get(sync->syncobj);
-                       if (XE_IOCTL_DBG(xe, !sync->fence))
-                               return -EINVAL;
+                       if (XE_IOCTL_DBG(xe, !sync->fence)) {
+                               err = -EINVAL;
+                               goto free_sync;
+                       }
 
                        err = dma_fence_chain_find_seqno(&sync->fence,
                                                         sync_in.timeline_value);
                        if (err)
-                               return err;
+                               goto free_sync;
                }
                break;
 
@@ -216,6 +222,10 @@ int xe_sync_entry_parse(struct xe_device *xe, struct xe_file *xef,
        sync->timeline_value = sync_in.timeline_value;
 
        return 0;
+
+free_sync:
+       xe_sync_entry_cleanup(sync);
+       return err;
 }
 ALLOW_ERROR_INJECTION(xe_sync_entry_parse, ERRNO);