Commit c60d101a authored by Qingfang Deng's avatar Qingfang Deng Committed by Jakub Kicinski
Browse files

net: stmmac: Fix accessing freed irq affinity_hint 



The cpumask should not be a local variable, since its pointer is saved
to irq_desc and may be accessed from procfs.
To fix it, use the persistent mask cpumask_of(cpu#).

Cc: stable@vger.kernel.org
Fixes: 8deec94c ("net: stmmac: set IRQ affinity hint for multi MSI vectors")
Signed-off-by: default avatarQingfang Deng <dqfext@gmail.com>
Reviewed-by: default avatarJacob Keller <jacob.e.keller@intel.com>
Link: https://patch.msgid.link/20250318032424.112067-1-dqfext@gmail.com


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

drivers/net/ethernet/stmicro/stmmac/stmmac_main.c

+4 −7
Original line number Diff line number Diff line
@@ -3640,7 +3640,6 @@ static int stmmac_request_irq_multi_msi(struct net_device *dev) 
{

	struct stmmac_priv *priv = netdev_priv(dev);

	enum request_irq_err irq_err;

	cpumask_t cpu_mask;

	int irq_idx = 0;

	char *int_name;

	int ret;
@@ -3769,9 +3768,8 @@ static int stmmac_request_irq_multi_msi(struct net_device *dev) 
			irq_idx = i;

			goto irq_error;

		}

		cpumask_clear(&cpu_mask);

		cpumask_set_cpu(i % num_online_cpus(), &cpu_mask);

		irq_set_affinity_hint(priv->rx_irq[i], &cpu_mask);

		irq_set_affinity_hint(priv->rx_irq[i],

				      cpumask_of(i % num_online_cpus()));

	}



	/* Request Tx MSI irq */
@@ -3794,9 +3792,8 @@ static int stmmac_request_irq_multi_msi(struct net_device *dev) 
			irq_idx = i;

			goto irq_error;

		}

		cpumask_clear(&cpu_mask);

		cpumask_set_cpu(i % num_online_cpus(), &cpu_mask);

		irq_set_affinity_hint(priv->tx_irq[i], &cpu_mask);

		irq_set_affinity_hint(priv->tx_irq[i],

				      cpumask_of(i % num_online_cpus()));

	}



	return 0;