From: Emil Tantilov Fix a memory leak in the error path where kfree(iadev) was not called following an error in auxiliary_device_add(). Fixes: f9f5301e7e2d ("ice: Register auxiliary device to provide RDMA") Signed-off-by: Emil Tantilov Reviewed-by: Przemek Kitszel Reviewed-by: Aleksandr Loktionov Signed-off-by: Tony Nguyen --- drivers/net/ethernet/intel/ice/ice_idc.c | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/drivers/net/ethernet/intel/ice/ice_idc.c b/drivers/net/ethernet/intel/ice/ice_idc.c index 420d45c2558b..8c4a3dc22a7c 100644 --- a/drivers/net/ethernet/intel/ice/ice_idc.c +++ b/drivers/net/ethernet/intel/ice/ice_idc.c @@ -322,16 +322,12 @@ int ice_plug_aux_dev(struct ice_pf *pf) "roce" : "iwarp"; ret = auxiliary_device_init(adev); - if (ret) { - kfree(iadev); - return ret; - } + if (ret) + goto free_iadev; ret = auxiliary_device_add(adev); - if (ret) { - auxiliary_device_uninit(adev); - return ret; - } + if (ret) + goto aux_dev_uninit; mutex_lock(&pf->adev_mutex); cdev->adev = adev; @@ -339,6 +335,13 @@ int ice_plug_aux_dev(struct ice_pf *pf) set_bit(ICE_FLAG_AUX_DEV_CREATED, pf->flags); return 0; + +aux_dev_uninit: + auxiliary_device_uninit(adev); +free_iadev: + kfree(iadev); + + return ret; } /* ice_unplug_aux_dev - unregister and free AUX device -- 2.47.1