Skip to content

Commit 4616920

Browse files
Daniel Borkmanngregkh
Daniel Borkmann
authored andcommitted
ixgbe: fix use after free adapter->state test in ixgbe_remove/ixgbe_probe
commit b5b2ffc upstream. While working on a different issue, I noticed an annoying use after free bug on my machine when unloading the ixgbe driver: [ 8642.318797] ixgbe 0000:02:00.1: removed PHC on p2p2 [ 8642.742716] ixgbe 0000:02:00.1: complete [ 8642.743784] BUG: unable to handle kernel paging request at ffff8807d3740a90 [ 8642.744828] IP: [<ffffffffa01c77dc>] ixgbe_remove+0xfc/0x1b0 [ixgbe] [ 8642.745886] PGD 20c6067 PUD 81c1f6067 PMD 81c15a067 PTE 80000007d3740060 [ 8642.746956] Oops: 0002 [#1] SMP DEBUG_PAGEALLOC [ 8642.748039] Modules linked in: [...] [ 8642.752929] CPU: 1 PID: 1225 Comm: rmmod Not tainted 3.18.0-rc2+ #49 [ 8642.754203] Hardware name: Supermicro X10SLM-F/X10SLM-F, BIOS 1.1b 11/01/2013 [ 8642.755505] task: ffff8807e34d3fe0 ti: ffff8807b7204000 task.ti: ffff8807b7204000 [ 8642.756831] RIP: 0010:[<ffffffffa01c77dc>] [<ffffffffa01c77dc>] ixgbe_remove+0xfc/0x1b0 [ixgbe] [...] [ 8642.774335] Stack: [ 8642.775805] ffff8807ee824098 ffff8807ee824098 ffffffffa01f3000 ffff8807ee824000 [ 8642.777326] ffff8807b7207e18 ffffffff8137720f ffff8807ee824098 ffff8807ee824098 [ 8642.778848] ffffffffa01f3068 ffff8807ee8240f8 ffff8807b7207e38 ffffffff8144180f [ 8642.780365] Call Trace: [ 8642.781869] [<ffffffff8137720f>] pci_device_remove+0x3f/0xc0 [ 8642.783395] [<ffffffff8144180f>] __device_release_driver+0x7f/0xf0 [ 8642.784876] [<ffffffff814421f8>] driver_detach+0xb8/0xc0 [ 8642.786352] [<ffffffff814414a9>] bus_remove_driver+0x59/0xe0 [ 8642.787783] [<ffffffff814429d0>] driver_unregister+0x30/0x70 [ 8642.789202] [<ffffffff81375c65>] pci_unregister_driver+0x25/0xa0 [ 8642.790657] [<ffffffffa01eb38e>] ixgbe_exit_module+0x1c/0xc8e [ixgbe] [ 8642.792064] [<ffffffff810f93a2>] SyS_delete_module+0x132/0x1c0 [ 8642.793450] [<ffffffff81012c61>] ? do_notify_resume+0x61/0xa0 [ 8642.794837] [<ffffffff816d2029>] system_call_fastpath+0x12/0x17 The issue is that test_and_set_bit() done on adapter->state is being performed *after* the netdevice has been freed via free_netdev(). When netdev is being allocated on initialization time, it allocates a private area, here struct ixgbe_adapter, that resides after the net_device structure. In ixgbe_probe(), the device init routine, we set up the adapter after alloc_etherdev_mq() on the private area and add a reference for the pci_dev as well via pci_set_drvdata(). Both in the error path of ixgbe_probe(), but also on module unload when ixgbe_remove() is being called, commit 41c6284 ("ixgbe: Fix rcu warnings induced by LER") accesses adapter after free_netdev(). The patch stores the result in a bool and thus fixes above oops on my side. Fixes: 41c6284 ("ixgbe: Fix rcu warnings induced by LER") Cc: Mark Rustad <[email protected]> Signed-off-by: Daniel Borkmann <[email protected]> Signed-off-by: Jeff Kirsher <[email protected]> Signed-off-by: David S. Miller <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
1 parent 927a171 commit 4616920

File tree

1 file changed

+6
-2
lines changed

1 file changed

+6
-2
lines changed

drivers/net/ethernet/intel/ixgbe/ixgbe_main.c

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8084,6 +8084,7 @@ static int ixgbe_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
80848084
int i, err, pci_using_dac, expected_gts;
80858085
unsigned int indices = MAX_TX_QUEUES;
80868086
u8 part_str[IXGBE_PBANUM_LENGTH];
8087+
bool disable_dev = false;
80878088
#ifdef IXGBE_FCOE
80888089
u16 device_caps;
80898090
#endif
@@ -8477,13 +8478,14 @@ static int ixgbe_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
84778478
iounmap(adapter->io_addr);
84788479
kfree(adapter->mac_table);
84798480
err_ioremap:
8481+
disable_dev = !test_and_set_bit(__IXGBE_DISABLED, &adapter->state);
84808482
free_netdev(netdev);
84818483
err_alloc_etherdev:
84828484
pci_release_selected_regions(pdev,
84838485
pci_select_bars(pdev, IORESOURCE_MEM));
84848486
err_pci_reg:
84858487
err_dma:
8486-
if (!adapter || !test_and_set_bit(__IXGBE_DISABLED, &adapter->state))
8488+
if (!adapter || disable_dev)
84878489
pci_disable_device(pdev);
84888490
return err;
84898491
}
@@ -8501,6 +8503,7 @@ static void ixgbe_remove(struct pci_dev *pdev)
85018503
{
85028504
struct ixgbe_adapter *adapter = pci_get_drvdata(pdev);
85038505
struct net_device *netdev = adapter->netdev;
8506+
bool disable_dev;
85048507

85058508
ixgbe_dbg_adapter_exit(adapter);
85068509

@@ -8550,11 +8553,12 @@ static void ixgbe_remove(struct pci_dev *pdev)
85508553
e_dev_info("complete\n");
85518554

85528555
kfree(adapter->mac_table);
8556+
disable_dev = !test_and_set_bit(__IXGBE_DISABLED, &adapter->state);
85538557
free_netdev(netdev);
85548558

85558559
pci_disable_pcie_error_reporting(pdev);
85568560

8557-
if (!test_and_set_bit(__IXGBE_DISABLED, &adapter->state))
8561+
if (disable_dev)
85588562
pci_disable_device(pdev);
85598563
}
85608564

0 commit comments

Comments
 (0)