i40e: Memory leak in i40e_config_iwarp_qvlist

commit 0b63644602cfcbac849f7ea49272a39e90fa95eb upstream.

Added freeing the old allocation of vf->qvlist_info in function
i40e_config_iwarp_qvlist before overwriting it with
the new allocation.

Signed-off-by: Martyna Szapar <martyna.szapar@intel.com>
Tested-by: Andrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: Ben Hutchings <ben.hutchings@codethink.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c b/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c
index 8fb025abb687f1514ce464d098d5e4daf561395f..e769aec859c6106962817386ab52c51bb69a1d48 100644 (file)
--- a/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c
+++ b/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c
@@ -418,6 +418,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;
 
@@ -426,16 +427,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;
@@ -446,8 +450,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;
 
@@ -489,10 +495,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;
 }
 
 /**