Skip to content

Commit d7442f5

Browse files
alobakinanguy11
authored andcommitted
ice: arfs: fix use-after-free when freeing @rx_cpu_rmap
The CI testing bots triggered the following splat: [ 718.203054] BUG: KASAN: use-after-free in free_irq_cpu_rmap+0x53/0x80 [ 718.206349] Read of size 4 at addr ffff8881bd127e00 by task sh/20834 [ 718.212852] CPU: 28 PID: 20834 Comm: sh Kdump: loaded Tainted: G S W IOE 5.17.0-rc8_nextqueue-devqueue-02643-g23f3121aca93 #1 [ 718.219695] Hardware name: Intel Corporation S2600WFT/S2600WFT, BIOS SE5C620.86B.02.01.0012.070720200218 07/07/2020 [ 718.223418] Call Trace: [ 718.227139] [ 718.230783] dump_stack_lvl+0x33/0x42 [ 718.234431] print_address_description.constprop.9+0x21/0x170 [ 718.238177] ? free_irq_cpu_rmap+0x53/0x80 [ 718.241885] ? free_irq_cpu_rmap+0x53/0x80 [ 718.245539] kasan_report.cold.18+0x7f/0x11b [ 718.249197] ? free_irq_cpu_rmap+0x53/0x80 [ 718.252852] free_irq_cpu_rmap+0x53/0x80 [ 718.256471] ice_free_cpu_rx_rmap.part.11+0x37/0x50 [ice] [ 718.260174] ice_remove_arfs+0x5f/0x70 [ice] [ 718.263810] ice_rebuild_arfs+0x3b/0x70 [ice] [ 718.267419] ice_rebuild+0x39c/0xb60 [ice] [ 718.270974] ? asm_sysvec_apic_timer_interrupt+0x12/0x20 [ 718.274472] ? ice_init_phy_user_cfg+0x360/0x360 [ice] [ 718.278033] ? delay_tsc+0x4a/0xb0 [ 718.281513] ? preempt_count_sub+0x14/0xc0 [ 718.284984] ? delay_tsc+0x8f/0xb0 [ 718.288463] ice_do_reset+0x92/0xf0 [ice] [ 718.292014] ice_pci_err_resume+0x91/0xf0 [ice] [ 718.295561] pci_reset_function+0x53/0x80 <...> [ 718.393035] Allocated by task 690: [ 718.433497] Freed by task 20834: [ 718.495688] Last potentially related work creation: [ 718.568966] The buggy address belongs to the object at ffff8881bd127e00 which belongs to the cache kmalloc-96 of size 96 [ 718.574085] The buggy address is located 0 bytes inside of 96-byte region [ffff8881bd127e00, ffff8881bd127e60) [ 718.579265] The buggy address belongs to the page: [ 718.598905] Memory state around the buggy address: [ 718.601809] ffff8881bd127d00: fa fb fb fb fb fb fb fb fb fb fb fb fc fc fc fc [ 718.604796] ffff8881bd127d80: 00 00 00 00 00 00 00 00 00 00 fc fc fc fc fc fc [ 718.607794] >ffff8881bd127e00: fa fb fb fb fb fb fb fb fb fb fb fb fc fc fc fc [ 718.610811] ^ [ 718.613819] ffff8881bd127e80: 00 00 00 00 00 00 00 00 00 00 00 00 fc fc fc fc [ 718.617107] ffff8881bd127f00: fa fb fb fb fb fb fb fb fb fb fb fb fc fc fc fc This is due to that free_irq_cpu_rmap() is always being called *after* (devm_)free_irq() and thus it tries to work with IRQ descs already freed. For example, on device reset the driver frees the rmap right before allocating a new one (the splat above). Make rmap creation and freeing function symmetrical with {request,free}_irq() calls i.e. do that on ifup/ifdown instead of device probe/remove/resume. These operations can be performed independently from the actual device aRFS configuration. Also, make sure ice_vsi_free_irq() clears IRQ affinity notifiers only when aRFS is disabled -- otherwise, CPU rmap sets and clears its own and they must not be touched manually. Fixes: 28bf267 ("ice: Implement aRFS") Co-developed-by: Ivan Vecera <ivecera@redhat.com> Signed-off-by: Ivan Vecera <ivecera@redhat.com> Signed-off-by: Alexander Lobakin <alexandr.lobakin@intel.com> Tested-by: Ivan Vecera <ivecera@redhat.com> Signed-off-by: Tony Nguyen <anthony.l.nguyen@intel.com>
1 parent 7cea556 commit d7442f5

File tree

3 files changed

+14
-18
lines changed

3 files changed

+14
-18
lines changed

drivers/net/ethernet/intel/ice/ice_arfs.c

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -577,7 +577,7 @@ void ice_free_cpu_rx_rmap(struct ice_vsi *vsi)
577577
{
578578
struct net_device *netdev;
579579

580-
if (!vsi || vsi->type != ICE_VSI_PF || !vsi->arfs_fltr_list)
580+
if (!vsi || vsi->type != ICE_VSI_PF)
581581
return;
582582

583583
netdev = vsi->netdev;
@@ -599,7 +599,7 @@ int ice_set_cpu_rx_rmap(struct ice_vsi *vsi)
599599
int base_idx, i;
600600

601601
if (!vsi || vsi->type != ICE_VSI_PF)
602-
return -EINVAL;
602+
return 0;
603603

604604
pf = vsi->back;
605605
netdev = vsi->netdev;
@@ -636,7 +636,6 @@ void ice_remove_arfs(struct ice_pf *pf)
636636
if (!pf_vsi)
637637
return;
638638

639-
ice_free_cpu_rx_rmap(pf_vsi);
640639
ice_clear_arfs(pf_vsi);
641640
}
642641

@@ -653,9 +652,5 @@ void ice_rebuild_arfs(struct ice_pf *pf)
653652
return;
654653

655654
ice_remove_arfs(pf);
656-
if (ice_set_cpu_rx_rmap(pf_vsi)) {
657-
dev_err(ice_pf_to_dev(pf), "Failed to rebuild aRFS\n");
658-
return;
659-
}
660655
ice_init_arfs(pf_vsi);
661656
}

drivers/net/ethernet/intel/ice/ice_lib.c

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2689,6 +2689,8 @@ void ice_vsi_free_irq(struct ice_vsi *vsi)
26892689
return;
26902690

26912691
vsi->irqs_ready = false;
2692+
ice_free_cpu_rx_rmap(vsi);
2693+
26922694
ice_for_each_q_vector(vsi, i) {
26932695
u16 vector = i + base;
26942696
int irq_num;
@@ -2702,7 +2704,8 @@ void ice_vsi_free_irq(struct ice_vsi *vsi)
27022704
continue;
27032705

27042706
/* clear the affinity notifier in the IRQ descriptor */
2705-
irq_set_affinity_notifier(irq_num, NULL);
2707+
if (!IS_ENABLED(CONFIG_RFS_ACCEL))
2708+
irq_set_affinity_notifier(irq_num, NULL);
27062709

27072710
/* clear the affinity_mask in the IRQ descriptor */
27082711
irq_set_affinity_hint(irq_num, NULL);

drivers/net/ethernet/intel/ice/ice_main.c

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2510,6 +2510,13 @@ static int ice_vsi_req_irq_msix(struct ice_vsi *vsi, char *basename)
25102510
irq_set_affinity_hint(irq_num, &q_vector->affinity_mask);
25112511
}
25122512

2513+
err = ice_set_cpu_rx_rmap(vsi);
2514+
if (err) {
2515+
netdev_err(vsi->netdev, "Failed to setup CPU RMAP on VSI %u: %pe\n",
2516+
vsi->vsi_num, ERR_PTR(err));
2517+
goto free_q_irqs;
2518+
}
2519+
25132520
vsi->irqs_ready = true;
25142521
return 0;
25152522

@@ -3692,20 +3699,12 @@ static int ice_setup_pf_sw(struct ice_pf *pf)
36923699
*/
36933700
ice_napi_add(vsi);
36943701

3695-
status = ice_set_cpu_rx_rmap(vsi);
3696-
if (status) {
3697-
dev_err(dev, "Failed to set CPU Rx map VSI %d error %d\n",
3698-
vsi->vsi_num, status);
3699-
goto unroll_napi_add;
3700-
}
37013702
status = ice_init_mac_fltr(pf);
37023703
if (status)
3703-
goto free_cpu_rx_map;
3704+
goto unroll_napi_add;
37043705

37053706
return 0;
37063707

3707-
free_cpu_rx_map:
3708-
ice_free_cpu_rx_rmap(vsi);
37093708
unroll_napi_add:
37103709
ice_tc_indir_block_unregister(vsi);
37113710
unroll_cfg_netdev:
@@ -5167,7 +5166,6 @@ static int __maybe_unused ice_suspend(struct device *dev)
51675166
continue;
51685167
ice_vsi_free_q_vectors(pf->vsi[v]);
51695168
}
5170-
ice_free_cpu_rx_rmap(ice_get_main_vsi(pf));
51715169
ice_clear_interrupt_scheme(pf);
51725170

51735171
pci_save_state(pdev);

0 commit comments

Comments
 (0)