[iwl-net,2/3] idpf: fix memleak in vport interrupt configuration

Commit Message

Alexander Lobakin July 24, 2024, 1:40 p.m. UTC

From: Michal Kubiak <[e-mail]>

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: [e-mail] # 6.7
Signed-off-by: Michal Kubiak <[e-mail]>
Reviewed-by: Pavan Kumar Linga <[e-mail]>
Signed-off-by: Alexander Lobakin <[e-mail]>
---
 drivers/net/ethernet/intel/idpf/idpf_txrx.c | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

Comments

Simon Horman July 26, 2024, 4:16 p.m. UTC | #1

On Wed, Jul 24, 2024 at 03:40:23PM +0200, Alexander Lobakin wrote:
> From: Michal Kubiak <[e-mail]>
> 
> 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: [e-mail] # 6.7
> Signed-off-by: Michal Kubiak <[e-mail]>
> Reviewed-by: Pavan Kumar Linga <[e-mail]>
> Signed-off-by: Alexander Lobakin <[e-mail]>

Reviewed-by: Simon Horman <[e-mail]>

Singh, Krishneil K Aug. 2, 2024, 12:22 a.m. UTC | #2

> -----Original Message-----
> From: Intel-wired-lan <[e-mail]> On Behalf Of
> Simon Horman
> Sent: Friday, July 26, 2024 9:16 AM
> To: Lobakin, Aleksander <[e-mail]>
> Cc: Linga, Pavan Kumar <[e-mail]>; NEX SW NCIS OSDT ITP
> Upstreaming <[e-mail]>;
> [e-mail]; [e-mail]; [e-mail];
> Eric Dumazet <[e-mail]>; Kubiak, Michal
> <[e-mail]>; Nguyen, Anthony L
> <[e-mail]>; Jakub Kicinski <[e-mail]>; intel-wired-
> [e-mail]; Paolo Abeni <[e-mail]>; David S. Miller
> <[e-mail]>
> Subject: Re: [Intel-wired-lan] [PATCH iwl-net 2/3] idpf: fix memleak in vport
> interrupt configuration
> 
> On Wed, Jul 24, 2024 at 03:40:23PM +0200, Alexander Lobakin wrote:
> > From: Michal Kubiak <[e-mail]>
> >
> > 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: [e-mail] # 6.7
> > Signed-off-by: Michal Kubiak <[e-mail]>
> > Reviewed-by: Pavan Kumar Linga <[e-mail]>
> > Signed-off-by: Alexander Lobakin <[e-mail]>
> 
> Reviewed-by: Simon Horman <[e-mail]>

Tested-by: Krishneil Singh <[e-mail]>

Patch

diff --git a/drivers/net/ethernet/intel/idpf/idpf_txrx.c b/drivers/net/ethernet/intel/idpf/idpf_txrx.c
index af2879f03b8d..a2f9f252694a 100644
--- a/drivers/net/ethernet/intel/idpf/idpf_txrx.c
+++ b/drivers/net/ethernet/intel/idpf/idpf_txrx.c
@@ -3780,13 +3780,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];
@@ -3804,8 +3806,8 @@  static int idpf_vport_intr_req_irq(struct idpf_vport *vport, char *basename)
 		else
 			continue;
 
-		name = kasprintf(GFP_KERNEL, "%s-%s-%d", basename, vec_name,
-				 vidx);
+		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,
 				  name, q_vector);
@@ -4326,7 +4328,6 @@  int idpf_vport_intr_alloc(struct idpf_vport *vport)
  */
 int idpf_vport_intr_init(struct idpf_vport *vport)
 {
-	char *int_name;
 	int err;
 
 	err = idpf_vport_intr_init_vec_idx(vport);
@@ -4340,11 +4341,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;