Message ID | 1520412364-2680-1-git-send-email-wei.guo.simon@gmail.com (mailing list archive) |
---|---|
State | Accepted |
Commit | 97c6f25d5828b497e3e802b1f7c70187c88df623 |
Headers | show |
Series | PCI/hotplug: ppc: correct a php_slot usage after free | expand |
On Wed, 2018-03-07 at 08:46:04 UTC, wei.guo.simon@gmail.com wrote: > From: Simon Guo <wei.guo.simon@gmail.com> > > In pnv_php_unregister_one(), pnv_php_put_slot() might kfree > php_slot structure. But there is pci_hp_deregister() after > that with php_slot reference. > > This patch moves pnv_php_put_slot() to the end of function. > > Signed-off-by: Simon Guo <wei.guo.simon@gmail.com> Applied to powerpc next, thanks. https://git.kernel.org/powerpc/c/97c6f25d5828b497e3e802b1f7c701 cheers
diff --git a/drivers/pci/hotplug/pnv_php.c b/drivers/pci/hotplug/pnv_php.c index 74f6a17..eb60692e 100644 --- a/drivers/pci/hotplug/pnv_php.c +++ b/drivers/pci/hotplug/pnv_php.c @@ -930,8 +930,8 @@ static void pnv_php_unregister_one(struct device_node *dn) return; php_slot->state = PNV_PHP_STATE_OFFLINE; - pnv_php_put_slot(php_slot); pci_hp_deregister(&php_slot->slot); + pnv_php_put_slot(php_slot); } static void pnv_php_unregister(struct device_node *dn)