> -----Original Message-----
> From: Intel-wired-lan <[email protected]> On Behalf
> Of ZhaoJinming
> Sent: Friday, May 29, 2026 7:38 AM
> To: Nguyen, Anthony L <[email protected]>; Kitszel,
> Przemyslaw <[email protected]>; Andrew Lunn
> <[email protected]>; David S . Miller <[email protected]>; Eric
> Dumazet <[email protected]>; Jakub Kicinski <[email protected]>; Paolo
> Abeni <[email protected]>
> Cc: [email protected]; [email protected]; linux-
> [email protected]; ZhaoJinming <[email protected]>
> Subject: [Intel-wired-lan] [PATCH net v2 2/2] ice: dpll: fix memory
> leak in ice_dpll_init_info error paths
>
> Several error return paths in ice_dpll_init_info() directly return
> without freeing previously allocated resources, causing memory leaks:
>
> - When de->input_prio allocation fails, d->inputs is leaked
> - When dp->input_prio allocation fails, d->inputs and de->input_prio
> are leaked
> - When ice_get_cgu_rclk_pin_info() fails, all previously allocated
> inputs/outputs/input_prio are leaked
> - When ice_dpll_init_pins_info(RCLK_INPUT) fails, same resources
> are leaked
>
> Fix this by jumping to the deinit_info label which properly calls
> ice_dpll_deinit_info() to free all allocated resources.
>
> Fixes: d7999f5ea64b ("ice: implement dpll interface to control cgu")
> Signed-off-by: ZhaoJinming <[email protected]>
> ---
> drivers/net/ethernet/intel/ice/ice_dpll.c | 16 ++++++++++------
> 1 file changed, 10 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/net/ethernet/intel/ice/ice_dpll.c
> b/drivers/net/ethernet/intel/ice/ice_dpll.c
> index 99bb308255cc..7240152f1655 100644
> --- a/drivers/net/ethernet/intel/ice/ice_dpll.c
> +++ b/drivers/net/ethernet/intel/ice/ice_dpll.c
> @@ -4345,12 +4345,16 @@ static int ice_dpll_init_info(struct ice_pf
> *pf, bool cgu)
>
> alloc_size = sizeof(*de->input_prio) * d->num_inputs;
> de->input_prio = kzalloc(alloc_size, GFP_KERNEL);
> - if (!de->input_prio)
> - return -ENOMEM;
> + if (!de->input_prio) {
> + ret = -ENOMEM;
> + goto deinit_info;
> + }
>
> dp->input_prio = kzalloc(alloc_size, GFP_KERNEL);
> - if (!dp->input_prio)
> - return -ENOMEM;
> + if (!dp->input_prio) {
> + ret = -ENOMEM;
> + goto deinit_info;
> + }
>
> ret = ice_dpll_init_pins_info(pf, ICE_DPLL_PIN_TYPE_INPUT);
> if (ret)
> @@ -4375,12 +4379,12 @@ static int ice_dpll_init_info(struct ice_pf
> *pf, bool cgu)
> ret = ice_get_cgu_rclk_pin_info(&pf->hw, &d->base_rclk_idx,
> &pf->dplls.rclk.num_parents);
> if (ret)
> - return ret;
> + goto deinit_info;
> for (i = 0; i < pf->dplls.rclk.num_parents; i++)
> pf->dplls.rclk.parent_idx[i] = d->base_rclk_idx + i;
> ret = ice_dpll_init_pins_info(pf,
> ICE_DPLL_PIN_TYPE_RCLK_INPUT);
> if (ret)
> - return ret;
> + goto deinit_info;
> de->mode = DPLL_MODE_AUTOMATIC;
> dp->mode = DPLL_MODE_AUTOMATIC;
>
> --
> 2.20.1
Reviewed-by: Aleksandr Loktionov <[email protected]>
Code looks correct. Please add `Cc: [email protected] # v6.7+` to both
patches and include a v1→v2 changelog before reposting as v3.
