Skip to content

Commit 442312c

Browse files
LGA1150gregkh
authored andcommitted
net: stmmac: Fix accessing freed irq affinity_hint
[ Upstream commit c60d101 ] 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> Signed-off-by: Sasha Levin <sashal@kernel.org>
1 parent 725a59d commit 442312c

File tree

1 file changed

+4
-7
lines changed

1 file changed

+4
-7
lines changed

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

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3603,7 +3603,6 @@ static int stmmac_request_irq_multi_msi(struct net_device *dev)
36033603
{
36043604
struct stmmac_priv *priv = netdev_priv(dev);
36053605
enum request_irq_err irq_err;
3606-
cpumask_t cpu_mask;
36073606
int irq_idx = 0;
36083607
char *int_name;
36093608
int ret;
@@ -3732,9 +3731,8 @@ static int stmmac_request_irq_multi_msi(struct net_device *dev)
37323731
irq_idx = i;
37333732
goto irq_error;
37343733
}
3735-
cpumask_clear(&cpu_mask);
3736-
cpumask_set_cpu(i % num_online_cpus(), &cpu_mask);
3737-
irq_set_affinity_hint(priv->rx_irq[i], &cpu_mask);
3734+
irq_set_affinity_hint(priv->rx_irq[i],
3735+
cpumask_of(i % num_online_cpus()));
37383736
}
37393737

37403738
/* Request Tx MSI irq */
@@ -3757,9 +3755,8 @@ static int stmmac_request_irq_multi_msi(struct net_device *dev)
37573755
irq_idx = i;
37583756
goto irq_error;
37593757
}
3760-
cpumask_clear(&cpu_mask);
3761-
cpumask_set_cpu(i % num_online_cpus(), &cpu_mask);
3762-
irq_set_affinity_hint(priv->tx_irq[i], &cpu_mask);
3758+
irq_set_affinity_hint(priv->tx_irq[i],
3759+
cpumask_of(i % num_online_cpus()));
37633760
}
37643761

37653762
return 0;

0 commit comments

Comments
 (0)