summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Carpenter <dan.carpenter@oracle.com>2021-08-12 10:00:04 +0300
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2021-09-22 11:48:13 +0200
commit1a091bfd11e61032b6192cf2a1ebb259889f28b3 (patch)
treef537f8819cb9e0789f872b61d08517c1eaff56e1
parent91264ae7fceb7e30172ab7dd27e3e41751cb83b3 (diff)
downloadlinux-stable-1a091bfd11e61032b6192cf2a1ebb259889f28b3.tar.gz
linux-stable-1a091bfd11e61032b6192cf2a1ebb259889f28b3.tar.bz2
linux-stable-1a091bfd11e61032b6192cf2a1ebb259889f28b3.zip
PCI: Fix pci_dev_str_match_path() alloc while atomic bug
[ Upstream commit 7eb6ea4148579b85540a41d57bcec315b8af8ff8 ] pci_dev_str_match_path() is often called with a spinlock held so the allocation has to be atomic. The call tree is: pci_specified_resource_alignment() <-- takes spin_lock(); pci_dev_str_match() pci_dev_str_match_path() Fixes: 45db33709ccc ("PCI: Allow specifying devices using a base bus and path of devfns") Link: https://lore.kernel.org/r/20210812070004.GC31863@kili Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> Signed-off-by: Bjorn Helgaas <bhelgaas@google.com> Reviewed-by: Logan Gunthorpe <logang@deltatee.com> Signed-off-by: Sasha Levin <sashal@kernel.org>
-rw-r--r--drivers/pci/pci.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c
index 077cc0512dd2..97d69b9be1d4 100644
--- a/drivers/pci/pci.c
+++ b/drivers/pci/pci.c
@@ -224,7 +224,7 @@ static int pci_dev_str_match_path(struct pci_dev *dev, const char *path,
*endptr = strchrnul(path, ';');
- wpath = kmemdup_nul(path, *endptr - path, GFP_KERNEL);
+ wpath = kmemdup_nul(path, *endptr - path, GFP_ATOMIC);
if (!wpath)
return -ENOMEM;