[PATCH 3.19 166/177] of/pci: Free resources on failure in of_pci_get_host_bridge_resources()

From: Greg Kroah-Hartman
Date: Mon Mar 16 2015 - 11:18:54 EST

3.19-stable review patch. If anyone has any objections, please let me know.


From: Lorenzo Pieralisi <lorenzo.pieralisi@xxxxxxx>

commit d2be00c0fb5ae0794deffcdb0425cd5a8d823db0 upstream.

In the function of_pci_get_host_bridge_resources() if the parsing of ranges
fails, previously allocated resources inclusive of bus_range are not freed
and are not expected to be freed by the function caller on error return.

This patch fixes the issues by adding code that properly frees resources
and bus_range before exiting the function with an error return value.

Fixes: cbe4097f8ae6 ("of/pci: Add support for parsing PCI host bridge resources from DT")
Signed-off-by: Lorenzo Pieralisi <lorenzo.pieralisi@xxxxxxx>
Signed-off-by: Bjorn Helgaas <bhelgaas@xxxxxxxxxx>
Acked-by: Liviu Dudau <liviu.dudau@xxxxxxx>
CC: Arnd Bergmann <arnd@xxxxxxxx>
CC: Rob Herring <robh+dt@xxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>

drivers/of/of_pci.c | 4 ++++
1 file changed, 4 insertions(+)

--- a/drivers/of/of_pci.c
+++ b/drivers/of/of_pci.c
@@ -140,6 +140,7 @@ int of_pci_get_host_bridge_resources(str
unsigned char busno, unsigned char bus_max,
struct list_head *resources, resource_size_t *io_base)
+ struct pci_host_bridge_window *window;
struct resource *res;
struct resource *bus_range;
struct of_pci_range range;
@@ -225,7 +226,10 @@ int of_pci_get_host_bridge_resources(str
+ list_for_each_entry(window, resources, list)
+ kfree(window->res);
+ kfree(bus_range);
return err;

To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/