]> git.ipfire.org Git - people/arne_f/kernel.git/commitdiff
PCI: Fix pci_dev_str_match_path() alloc while atomic bug
authorDan Carpenter <dan.carpenter@oracle.com>
Thu, 12 Aug 2021 07:00:04 +0000 (10:00 +0300)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 22 Sep 2021 10:39:28 +0000 (12:39 +0200)
[ 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>
drivers/pci/pci.c

index a5e6759c407b9200beb0ac375500e5bb02d84e7b..a4eb0c042ca3e849c7386ec4a016bc380553911d 100644 (file)
@@ -265,7 +265,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;