diff options
author | Roland Dreier <rolandd@cisco.com> | 2008-04-17 00:09:34 -0400 |
---|---|---|
committer | Roland Dreier <rolandd@cisco.com> | 2008-04-17 00:09:34 -0400 |
commit | 4cd1e5eb3cbe6e0cc934959770b4c60eac6ecf66 (patch) | |
tree | cf0a0219790a7fac9acf08727ad63de14c6c6bb4 | |
parent | 940801b27e021b3494a44bc93be3c73fadbe4c2f (diff) |
RDMA/nes: Free IRQ before killing tasklet
Move the free_irq() call in nes_remove() to before the tasklet_kill();
otherwise there is a window after tasklet_kill() where a new interrupt
can be handled and reschedule the tasklet, leading to a use-after-free
crash.
Cc: <stable@kernel.org>
Signed-off-by: Roland Dreier <rolandd@cisco.com>
-rw-r--r-- | drivers/infiniband/hw/nes/nes.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/infiniband/hw/nes/nes.c b/drivers/infiniband/hw/nes/nes.c index 7a89cd7327e2..b00b0e3a91dc 100644 --- a/drivers/infiniband/hw/nes/nes.c +++ b/drivers/infiniband/hw/nes/nes.c | |||
@@ -744,13 +744,13 @@ static void __devexit nes_remove(struct pci_dev *pcidev) | |||
744 | 744 | ||
745 | list_del(&nesdev->list); | 745 | list_del(&nesdev->list); |
746 | nes_destroy_cqp(nesdev); | 746 | nes_destroy_cqp(nesdev); |
747 | |||
748 | free_irq(pcidev->irq, nesdev); | ||
747 | tasklet_kill(&nesdev->dpc_tasklet); | 749 | tasklet_kill(&nesdev->dpc_tasklet); |
748 | 750 | ||
749 | /* Deallocate the Adapter Structure */ | 751 | /* Deallocate the Adapter Structure */ |
750 | nes_destroy_adapter(nesdev->nesadapter); | 752 | nes_destroy_adapter(nesdev->nesadapter); |
751 | 753 | ||
752 | free_irq(pcidev->irq, nesdev); | ||
753 | |||
754 | if (nesdev->msi_enabled) { | 754 | if (nesdev->msi_enabled) { |
755 | pci_disable_msi(pcidev); | 755 | pci_disable_msi(pcidev); |
756 | } | 756 | } |