i40e: Memory leak in i40e_config_iwarp_qvlist
Subsystems (2)
PATCH 1/1 i40e: Memory leak in i40e_config_iwarp_qvlist
From: Martyna Szapar <[email protected]>
Added freeing the old allocation of vf->qvlist_info in function i40e_config_iwarp_qvlist before overwriting it with the new allocation.
--- .../ethernet/intel/i40e/i40e_virtchnl_pf.c | 23 ++++++++++++------- 1 file changed, 15 insertions(+), 8 deletions(-)
drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c +15 -8
@@ -441,6 +441,7 @@ static int i40e_config_iwarp_qvlist(struct i40e_vf *vf,u32 v_idx, i, reg_idx, reg;u32 next_q_idx, next_q_type;u32 msix_vf, size; +int ret =0 ; msix_vf = pf->hw.func_caps.num_msix_vectors_vf;
@@ -449,16 +450,19 @@ static int i40e_config_iwarp_qvlist(struct i40e_vf *vf,"Incorrect number of iwarp vectors %u. Maximum %u allowed.\n" , qvlist_info->num_vectors, msix_vf); - goto err; + ret = -EINVAL ; + goto err_out; } size =sizeof (struct virtchnl_iwarp_qvlist_info ) + (sizeof (struct virtchnl_iwarp_qv_info ) * (qvlist_info->num_vectors -1 )); +kfree (vf->qvlist_info); vf->qvlist_info =kzalloc (size,GFP_KERNEL ); -if (!vf->qvlist_info) -return -ENOMEM ; - +if (!vf->qvlist_info) { + ret = -ENOMEM ; + goto err_out; + } vf->qvlist_info->num_vectors = qvlist_info->num_vectors; msix_vf = pf->hw.func_caps.num_msix_vectors_vf;
@@ -469,8 +473,10 @@ static int i40e_config_iwarp_qvlist(struct i40e_vf *vf, v_idx = qv_info->v_idx;/* Validate vector id belongs to this vf */ -if (!i40e_vc_isvalid_vector_id (vf, v_idx)) - goto err; +if (!i40e_vc_isvalid_vector_id (vf, v_idx)) { + ret = -EINVAL ; + goto err_free; + } vf->qvlist_info->qv_info[i] = *qv_info;
@@ -512,10 +518,11 @@ static int i40e_config_iwarp_qvlist(struct i40e_vf *vf, }return 0 ; -err: +err_free:kfree (vf->qvlist_info); vf->qvlist_info =NULL ; -return -EINVAL ; +err_out: +return ret; }/**
Signature · 1 line
2.19.2
Bowers
PATCH 1/1 i40e: Memory leak in i40e_config_iwarp_qvlist
Quoted 12 lines
-----Original Message-----
From: Intel-wired-lan [mailto:intel-wired-lan-bounces at osuosl.org] On Behalf Of Alice Michael
Sent: Thursday, April 18, 2019 1:32 PM
To: Michael, Alice <[email protected]>; intel-wired- lan at lists.osuosl.org
Cc: Szapar, Martyna <[email protected]>
Subject: [Intel-wired-lan] [PATCH] i40e: Memory leak ini40e_config_iwarp_qvlistFrom: Martyna Szapar <[email protected]>
Quoted 7 lines
Added freeing the old allocation of
vf->qvlist_infoin functioni40e_config_iwarp_qvlistbefore overwriting it with the new allocation.Signed-off-by Martyna Szapar <[email protected]>--- .../ethernet/intel/i40e/i40e_virtchnl_pf.c | 23 ++++++++++++------- 1 file changed, 15 insertions(+), 8 deletions(-)