Skip to content

Commit ccca30a

Browse files
2045geminianguy11
authored andcommitted
ice: Fix improper handling of refcount in ice_dpll_init_rclk_pins()
This patch addresses a reference count handling issue in the ice_dpll_init_rclk_pins() function. The function calls ice_dpll_get_pins(), which increments the reference count of the relevant resources. However, if the condition WARN_ON((!vsi || !vsi->netdev)) is met, the function currently returns an error without properly releasing the resources acquired by ice_dpll_get_pins(), leading to a reference count leak. To resolve this, the check has been moved to the top of the function. This ensures that the function verifies the state before any resources are acquired, avoiding the need for additional resource management in the error path. This bug was identified by an experimental static analysis tool developed by our team. The tool specializes in analyzing reference count operations and detecting potential issues where resources are not properly managed. In this case, the tool flagged the missing release operation as a potential problem, which led to the development of this patch. Fixes: d7999f5 ("ice: implement dpll interface to control cgu") Cc: [email protected] Signed-off-by: Gui-Dong Han <[email protected]> Reviewed-by: Simon Horman <[email protected]> Tested-by: Pucha Himasekhar Reddy <[email protected]> (A Contingent worker at Intel) Signed-off-by: Tony Nguyen <[email protected]>
1 parent 839e3f9 commit ccca30a

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

drivers/net/ethernet/intel/ice/ice_dpll.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1843,6 +1843,8 @@ ice_dpll_init_rclk_pins(struct ice_pf *pf, struct ice_dpll_pin *pin,
18431843
struct dpll_pin *parent;
18441844
int ret, i;
18451845

1846+
if (WARN_ON((!vsi || !vsi->netdev)))
1847+
return -EINVAL;
18461848
ret = ice_dpll_get_pins(pf, pin, start_idx, ICE_DPLL_RCLK_NUM_PER_PF,
18471849
pf->dplls.clock_id);
18481850
if (ret)
@@ -1858,8 +1860,6 @@ ice_dpll_init_rclk_pins(struct ice_pf *pf, struct ice_dpll_pin *pin,
18581860
if (ret)
18591861
goto unregister_pins;
18601862
}
1861-
if (WARN_ON((!vsi || !vsi->netdev)))
1862-
return -EINVAL;
18631863
dpll_netdev_pin_set(vsi->netdev, pf->dplls.rclk.pin);
18641864

18651865
return 0;

0 commit comments

Comments
 (0)