IB/ipath: fix NULL dereference during cleanup
Fix NULL deref due to pcidev being clobbered before dd->ipath_f_cleanup() was called. Signed-off-by: Bryan O'Sullivan <bos@pathscale.com> Signed-off-by: Roland Dreier <rolandd@cisco.com>
This commit is contained in:
parent
94b8d9f98d
commit
b0ff7c2005
@ -1905,19 +1905,19 @@ static void __exit infinipath_cleanup(void)
|
|||||||
} else
|
} else
|
||||||
ipath_dbg("irq is 0, not doing free_irq "
|
ipath_dbg("irq is 0, not doing free_irq "
|
||||||
"for unit %u\n", dd->ipath_unit);
|
"for unit %u\n", dd->ipath_unit);
|
||||||
|
|
||||||
|
/*
|
||||||
|
* we check for NULL here, because it's outside
|
||||||
|
* the kregbase check, and we need to call it
|
||||||
|
* after the free_irq. Thus it's possible that
|
||||||
|
* the function pointers were never initialized.
|
||||||
|
*/
|
||||||
|
if (dd->ipath_f_cleanup)
|
||||||
|
/* clean up chip-specific stuff */
|
||||||
|
dd->ipath_f_cleanup(dd);
|
||||||
|
|
||||||
dd->pcidev = NULL;
|
dd->pcidev = NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
|
||||||
* we check for NULL here, because it's outside the kregbase
|
|
||||||
* check, and we need to call it after the free_irq. Thus
|
|
||||||
* it's possible that the function pointers were never
|
|
||||||
* initialized.
|
|
||||||
*/
|
|
||||||
if (dd->ipath_f_cleanup)
|
|
||||||
/* clean up chip-specific stuff */
|
|
||||||
dd->ipath_f_cleanup(dd);
|
|
||||||
|
|
||||||
spin_lock_irqsave(&ipath_devs_lock, flags);
|
spin_lock_irqsave(&ipath_devs_lock, flags);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user