Unverified Commit d3ded53f authored by Shuicheng Lin's avatar Shuicheng Lin Committed by Rodrigo Vivi
Browse files

drm/xe/gsc: Fix double-free of managed BO in error path 



The error path in xe_gsc_init_post_hwconfig() explicitly frees a BO
allocated with xe_managed_bo_create_pin_map() via
xe_bo_unpin_map_no_vm(). Since the managed BO already has a devm
cleanup action registered, this causes a double-free when devm
unwinds during probe failure.

Remove the explicit free and let devm handle it, consistent with
all other xe_managed_bo_create_pin_map() callers.

Fixes: 2e5d47fe ("drm/xe/uc: Use managed bo for HuC and GSC objects")
Reviewed-by: default avatarDaniele Ceraolo Spurio <daniele.ceraolospurio@intel.com>
Assisted-by: Claude:claude-opus-4.6
Link: https://patch.msgid.link/20260511154134.223696-1-shuicheng.lin@intel.com


Signed-off-by: default avatarShuicheng Lin <shuicheng.lin@intel.com>
(cherry picked from commit 71d61e3e299a17139e47f980a4d6f425b2c59bf7)
Signed-off-by: default avatarRodrigo Vivi <rodrigo.vivi@intel.com>
parent 6eb0168d

drivers/gpu/drm/xe/xe_gsc.c

+1 −4
Original line number Diff line number Diff line
@@ -482,8 +482,7 @@ int xe_gsc_init_post_hwconfig(struct xe_gsc *gsc) 
				 EXEC_QUEUE_FLAG_PERMANENT, 0);

	if (IS_ERR(q)) {

		xe_gt_err(gt, "Failed to create queue for GSC submission\n");

		err = PTR_ERR(q);

		goto out_bo;

		return PTR_ERR(q);

	}



	wq = alloc_ordered_workqueue("gsc-ordered-wq", 0);
@@ -506,8 +505,6 @@ int xe_gsc_init_post_hwconfig(struct xe_gsc *gsc) 


out_q:

	xe_exec_queue_put(q);

out_bo:

	xe_bo_unpin_map_no_vm(bo);

	return err;

}