Skip to content

Commit c60d101

Browse files
LGA1150kuba-moo
authored andcommitted
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: 8deec94 ("net: stmmac: set IRQ affinity hint for multi MSI vectors") Signed-off-by: Qingfang Deng <dqfext@gmail.com> Reviewed-by: Jacob Keller <jacob.e.keller@intel.com> Link: https://patch.msgid.link/20250318032424.112067-1-dqfext@gmail.com Signed-off-by: Jakub Kicinski <kuba@kernel.org>
1 parent 2f6efba commit c60d101

1 file changed

Lines changed: 4 additions & 7 deletions

File tree

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

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3640,7 +3640,6 @@ static int stmmac_request_irq_multi_msi(struct net_device *dev)
36403640
{
36413641
struct stmmac_priv *priv = netdev_priv(dev);
36423642
enum request_irq_err irq_err;
3643-
cpumask_t cpu_mask;
36443643
int irq_idx = 0;
36453644
char *int_name;
36463645
int ret;
@@ -3769,9 +3768,8 @@ static int stmmac_request_irq_multi_msi(struct net_device *dev)
37693768
irq_idx = i;
37703769
goto irq_error;
37713770
}
3772-
cpumask_clear(&cpu_mask);
3773-
cpumask_set_cpu(i % num_online_cpus(), &cpu_mask);
3774-
irq_set_affinity_hint(priv->rx_irq[i], &cpu_mask);
3771+
irq_set_affinity_hint(priv->rx_irq[i],
3772+
cpumask_of(i % num_online_cpus()));
37753773
}
37763774

37773775
/* Request Tx MSI irq */
@@ -3794,9 +3792,8 @@ static int stmmac_request_irq_multi_msi(struct net_device *dev)
37943792
irq_idx = i;
37953793
goto irq_error;
37963794
}
3797-
cpumask_clear(&cpu_mask);
3798-
cpumask_set_cpu(i % num_online_cpus(), &cpu_mask);
3799-
irq_set_affinity_hint(priv->tx_irq[i], &cpu_mask);
3795+
irq_set_affinity_hint(priv->tx_irq[i],
3796+
cpumask_of(i % num_online_cpus()));
38003797
}
38013798

38023799
return 0;

0 commit comments

Comments
 (0)