Commit d42b6b46 authored Jun 18, 2015 by Jingoo Han Committed by Sasha Levin Jul 05, 2015

of/address: use atomic allocation in pci_register_io_range()



[ 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>

parent b396bdb5

drivers/of/address.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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;