]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
of/address: use atomic allocation in pci_register_io_range()
authorJingoo Han <jingoohan1@gmail.com>
Wed, 17 Jun 2015 15:12:27 +0000 (00:12 +0900)
committerSasha Levin <sasha.levin@oracle.com>
Sun, 5 Jul 2015 14:12:48 +0000 (10:12 -0400)
[ Upstream commit 294240ffe784e951dc2ef070da04fa31ef6db3a0 ]

When kzalloc() is called under spin_lock(), GFP_ATOMIC should be
used to avoid sleeping allocation.
The call tree is:
  of_pci_range_to_resource()
    --> pci_register_io_range() <-- takes spin_lock(&io_range_lock);
       --> kzalloc()

Signed-off-by: Jingoo Han <jingoohan1@gmail.com>
Cc: stable@vger.kernel.org # 3.18+
Signed-off-by: Rob Herring <robh@kernel.org>
Signed-off-by: Sasha Levin <sasha.levin@oracle.com>
drivers/of/address.c

index d880affa04939a15dc74c5142dde6c4a8abfafa5..1dba1a9c1fcfe03a352bb35ea6b960f33013f3fa 100644 (file)
@@ -712,7 +712,7 @@ int __weak pci_register_io_range(phys_addr_t addr, resource_size_t size)
        }
 
        /* add the range to the list */
-       range = kzalloc(sizeof(*range), GFP_KERNEL);
+       range = kzalloc(sizeof(*range), GFP_ATOMIC);
        if (!range) {
                err = -ENOMEM;
                goto end_register;