Commit 3cc88e84 authored by Michal Kubiak's avatar Michal Kubiak Committed by Jakub Kicinski
Browse files

idpf: fix memleak in vport interrupt configuration 



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: d4d55871 ("idpf: initialize interrupts and enable vport")
Cc: stable@vger.kernel.org # 6.7
Signed-off-by: default avatarMichal Kubiak <michal.kubiak@intel.com>
Reviewed-by: default avatarPavan Kumar Linga <pavan.kumar.linga@intel.com>
Signed-off-by: default avatarAlexander Lobakin <aleksander.lobakin@intel.com>
Reviewed-by: default avatarSimon Horman <horms@kernel.org>
Tested-by: default avatarKrishneil Singh <krishneil.k.singh@intel.com>
Signed-off-by: default avatarTony Nguyen <anthony.l.nguyen@intel.com>
Link: https://patch.msgid.link/20240806220923.3359860-3-anthony.l.nguyen@intel.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent f01032a2

drivers/net/ethernet/intel/idpf/idpf_txrx.c

+8 −11
Original line number Diff line number Diff line
@@ -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;