* [PATCHv2] PCI/P2PDMA: Fix freeing dev_pagemap on error
@ 2018-10-12 15:59 Keith Busch
2018-10-12 19:30 ` Bjorn Helgaas
0 siblings, 1 reply; 2+ messages in thread
From: Keith Busch @ 2018-10-12 15:59 UTC (permalink / raw)
To: linux-pci, Bjorn Helgaas; +Cc: Keith Busch, Logan Gunthorpe
The devres_free() API is only to be used after the resource has been
unlinked from the device tracking it. Calling this functino directly will
hit a kernel BUG_ON. This patch fixes this to use the managed resource
release function, devm_kfree().
Fixes: 1380472e7b855 ("PCI/P2PDMA: Support peer-to-peer memory")
Cc: Logan Gunthorpe <logang@deltatee.com>
Signed-off-by: Keith Busch <keith.busch@intel.com>
---
v1 -> v2:
Fixed compile breaking typo in code
drivers/pci/p2pdma.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/pci/p2pdma.c b/drivers/pci/p2pdma.c
index da66c7e31730..9c56a10eff15 100644
--- a/drivers/pci/p2pdma.c
+++ b/drivers/pci/p2pdma.c
@@ -222,7 +222,7 @@ int pci_p2pdma_add_resource(struct pci_dev *pdev, int bar, size_t size,
return 0;
pgmap_free:
- devres_free(pgmap);
+ devm_kfree(&pdev->dev, pgmap);
return error;
}
EXPORT_SYMBOL_GPL(pci_p2pdma_add_resource);
--
2.14.4
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCHv2] PCI/P2PDMA: Fix freeing dev_pagemap on error
2018-10-12 15:59 [PATCHv2] PCI/P2PDMA: Fix freeing dev_pagemap on error Keith Busch
@ 2018-10-12 19:30 ` Bjorn Helgaas
0 siblings, 0 replies; 2+ messages in thread
From: Bjorn Helgaas @ 2018-10-12 19:30 UTC (permalink / raw)
To: Keith Busch; +Cc: linux-pci, Logan Gunthorpe
On Fri, Oct 12, 2018 at 09:59:20AM -0600, Keith Busch wrote:
> The devres_free() API is only to be used after the resource has been
> unlinked from the device tracking it. Calling this functino directly will
> hit a kernel BUG_ON. This patch fixes this to use the managed resource
> release function, devm_kfree().
>
> Fixes: 1380472e7b855 ("PCI/P2PDMA: Support peer-to-peer memory")
> Cc: Logan Gunthorpe <logang@deltatee.com>
> Signed-off-by: Keith Busch <keith.busch@intel.com>
I folded this fix into the original 1380472e7b855 commit (now
31fd98513249 ("PCI/P2PDMA: Support peer-to-peer memory"), thanks!
> ---
> v1 -> v2:
>
> Fixed compile breaking typo in code
>
> drivers/pci/p2pdma.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/pci/p2pdma.c b/drivers/pci/p2pdma.c
> index da66c7e31730..9c56a10eff15 100644
> --- a/drivers/pci/p2pdma.c
> +++ b/drivers/pci/p2pdma.c
> @@ -222,7 +222,7 @@ int pci_p2pdma_add_resource(struct pci_dev *pdev, int bar, size_t size,
> return 0;
>
> pgmap_free:
> - devres_free(pgmap);
> + devm_kfree(&pdev->dev, pgmap);
> return error;
> }
> EXPORT_SYMBOL_GPL(pci_p2pdma_add_resource);
> --
> 2.14.4
>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2018-10-12 19:30 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-10-12 15:59 [PATCHv2] PCI/P2PDMA: Fix freeing dev_pagemap on error Keith Busch
2018-10-12 19:30 ` Bjorn Helgaas
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).