Re: [PATCH] drm/xe/reg_sr: Fix leak on xa_store failure

["Vivekanandan, Balasubramani" <balasubramani.vivekanandan@intel.com>]

On 03.02.2026 17:36, Shuicheng Lin wrote:
> Free the newly allocated entry when xa_store() fails to avoid a memory
> leak on the error path.
> 
> Fixes: e5283bd4dfec ("drm/xe/reg_sr: Remove register pool")
> Cc: Matt Roper <matthew.d.roper@intel.com>
> Signed-off-by: Shuicheng Lin <shuicheng.lin@intel.com>
> ---
>  drivers/gpu/drm/xe/xe_reg_sr.c | 4 ++++
>  1 file changed, 4 insertions(+)
> 
> diff --git a/drivers/gpu/drm/xe/xe_reg_sr.c b/drivers/gpu/drm/xe/xe_reg_sr.c
> index d3e13ea33123..ce3dab8a0f47 100644
> --- a/drivers/gpu/drm/xe/xe_reg_sr.c
> +++ b/drivers/gpu/drm/xe/xe_reg_sr.c
> @@ -74,6 +74,7 @@ int xe_reg_sr_add(struct xe_reg_sr *sr,
>  {
>  	unsigned long idx = e->reg.addr;
>  	struct xe_reg_sr_entry *pentry = xa_load(&sr->xa, idx);
> +	bool allocated = false;
>  	int ret;
>  
>  	if (pentry) {
> @@ -94,6 +95,7 @@ int xe_reg_sr_add(struct xe_reg_sr *sr,
>  		ret = -ENOMEM;
>  		goto fail;
>  	}
> +	allocated = true;
>  
>  	*pentry = *e;
>  	ret = xa_err(xa_store(&sr->xa, idx, pentry, GFP_KERNEL));
> @@ -103,6 +105,8 @@ int xe_reg_sr_add(struct xe_reg_sr *sr,
>  	return 0;
>  

I would suggest create a new label above *fail:* which does kfree and
jump to it whenever pentry has to freed.

fail_free:
	kfree(pentry);


Regards,
Bala

>  fail:
> +	if (allocated)
> +		kfree(pentry);
>  	xe_gt_err(gt,
>  		  "discarding save-restore reg %04lx (clear: %08x, set: %08x, masked: %s, mcr: %s): ret=%d\n",
>  		  idx, e->clr_bits, e->set_bits,
> -- 
> 2.50.1
>