Commit f98de826 authored by Shuicheng Lin's avatar Shuicheng Lin Committed by Michal Wajdeczko
Browse files

drm/xe/hw_engine_group: Avoid call kfree() for drmm_kzalloc() 



Memory allocated with drmm_kzalloc() should not be freed using
kfree(), as it is managed by the DRM subsystem. The memory will
be automatically freed when the associated drm_device is released.
These 3 group pointers are allocated using drmm_kzalloc() in
hw_engine_group_alloc(), so they don't require manual deallocation.

Fixes: 67979060 ("drm/xe/hw_engine_group: Fix potential leak")
Cc: Michal Wajdeczko <michal.wajdeczko@intel.com>
Cc: Matthew Brost <matthew.brost@intel.com>
Signed-off-by: default avatarShuicheng Lin <shuicheng.lin@intel.com>
Reviewed-by: default avatarMatthew Brost <matthew.brost@intel.com>
Signed-off-by: default avatarMichal Wajdeczko <michal.wajdeczko@intel.com>
Link: https://lore.kernel.org/r/20250724193854.1124510-2-shuicheng.lin@intel.com
parent 51330ba6

drivers/gpu/drm/xe/xe_hw_engine_group.c

+6 −22
Original line number Diff line number Diff line
@@ -75,25 +75,18 @@ int xe_hw_engine_setup_groups(struct xe_gt *gt) 
	enum xe_hw_engine_id id;

	struct xe_hw_engine_group *group_rcs_ccs, *group_bcs, *group_vcs_vecs;

	struct xe_device *xe = gt_to_xe(gt);

	int err;



	group_rcs_ccs = hw_engine_group_alloc(xe);

	if (IS_ERR(group_rcs_ccs)) {

		err = PTR_ERR(group_rcs_ccs);

		goto err_group_rcs_ccs;

	}

	if (IS_ERR(group_rcs_ccs))

		return PTR_ERR(group_rcs_ccs);



	group_bcs = hw_engine_group_alloc(xe);

	if (IS_ERR(group_bcs)) {

		err = PTR_ERR(group_bcs);

		goto err_group_bcs;

	}

	if (IS_ERR(group_bcs))

		return PTR_ERR(group_bcs);



	group_vcs_vecs = hw_engine_group_alloc(xe);

	if (IS_ERR(group_vcs_vecs)) {

		err = PTR_ERR(group_vcs_vecs);

		goto err_group_vcs_vecs;

	}

	if (IS_ERR(group_vcs_vecs))

		return PTR_ERR(group_vcs_vecs);



	for_each_hw_engine(hwe, gt, id) {

		switch (hwe->class) {
@@ -116,15 +109,6 @@ int xe_hw_engine_setup_groups(struct xe_gt *gt) 
	}



	return 0;



err_group_vcs_vecs:

	kfree(group_vcs_vecs);

err_group_bcs:

	kfree(group_bcs);

err_group_rcs_ccs:

	kfree(group_rcs_ccs);



	return err;

}



/**