idpf: fix memleak in vport interrupt configuration

commit 3cc88e8405b8d55e0ff035e31971aadd6baee2b6 upstream.

The initialization of vport interrupt consists of two functions:
 1) idpf_vport_intr_init() where a generic configuration is done
 2) idpf_vport_intr_req_irq() where the irq for each q_vector is
   requested.

The first function used to create a base name for each interrupt using
"kasprintf()" call. Unfortunately, although that call allocated memory
for a text buffer, that memory was never released.

Fix this by removing creating the interrupt base name in 1).
Instead, always create a full interrupt name in the function 2), because
there is no need to create a base name separately, considering that the
function 2) is never called out of idpf_vport_intr_init() context.

Fixes: d4d558718266 ("idpf: initialize interrupts and enable vport")
Cc: stable@vger.kernel.org # 6.7
Signed-off-by: Michal Kubiak <michal.kubiak@intel.com>
Reviewed-by: Pavan Kumar Linga <pavan.kumar.linga@intel.com>
Signed-off-by: Alexander Lobakin <aleksander.lobakin@intel.com>
Reviewed-by: Simon Horman <horms@kernel.org>
Tested-by: Krishneil Singh <krishneil.k.singh@intel.com>
Signed-off-by: Tony Nguyen <anthony.l.nguyen@intel.com>
Link: https://patch.msgid.link/20240806220923.3359860-3-anthony.l.nguyen@intel.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/net/ethernet/intel/idpf/idpf_txrx.c b/drivers/net/ethernet/intel/idpf/idpf_txrx.c
index 0c22e524e56dbcfb29937f677a02aa3c7eb32df3..20ca04320d4bdeb06d1d06954f6b9141fb24e1c4 100644 (file)
--- a/drivers/net/ethernet/intel/idpf/idpf_txrx.c
+++ b/drivers/net/ethernet/intel/idpf/idpf_txrx.c
@@ -3614,13 +3614,15 @@ void idpf_vport_intr_update_itr_ena_irq(struct idpf_q_vector *q_vector)
 /**
  * idpf_vport_intr_req_irq - get MSI-X vectors from the OS for the vport
  * @vport: main vport structure
- * @basename: name for the vector
  */
-static int idpf_vport_intr_req_irq(struct idpf_vport *vport, char *basename)
+static int idpf_vport_intr_req_irq(struct idpf_vport *vport)
 {
        struct idpf_adapter *adapter = vport->adapter;
+       const char *drv_name, *if_name, *vec_name;
        int vector, err, irq_num, vidx;
-       const char *vec_name;
+
+       drv_name = dev_driver_string(&adapter->pdev->dev);
+       if_name = netdev_name(vport->netdev);
 
        for (vector = 0; vector < vport->num_q_vectors; vector++) {
                struct idpf_q_vector *q_vector = &vport->q_vectors[vector];
@@ -3637,8 +3639,8 @@ static int idpf_vport_intr_req_irq(struct idpf_vport *vport, char *basename)
                else
                        continue;
 
-               q_vector->name = kasprintf(GFP_KERNEL, "%s-%s-%d",
-                                          basename, vec_name, vidx);
+               q_vector->name = kasprintf(GFP_KERNEL, "%s-%s-%s-%d", drv_name,
+                                          if_name, vec_name, vidx);
 
                err = request_irq(irq_num, idpf_vport_intr_clean_queues, 0,
                                  q_vector->name, q_vector);
@@ -4148,7 +4150,6 @@ error:
  */
 int idpf_vport_intr_init(struct idpf_vport *vport)
 {
-       char *int_name;
        int err;
 
        err = idpf_vport_intr_init_vec_idx(vport);
@@ -4162,11 +4163,7 @@ int idpf_vport_intr_init(struct idpf_vport *vport)
        if (err)
                goto unroll_vectors_alloc;
 
-       int_name = kasprintf(GFP_KERNEL, "%s-%s",
-                            dev_driver_string(&vport->adapter->pdev->dev),
-                            vport->netdev->name);
-
-       err = idpf_vport_intr_req_irq(vport, int_name);
+       err = idpf_vport_intr_req_irq(vport);
        if (err)
                goto unroll_vectors_alloc;