Commit c0064e10 authored by Lorenzo Pieralisi's avatar Lorenzo Pieralisi Committed by Sasha Levin

of/pci: Free resources on failure in of_pci_get_host_bridge_resources()

commit d2be00c0 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: cbe4097f ("of/pci: Add support for parsing PCI host bridge resources from DT")
Signed-off-by: default avatarLorenzo Pieralisi <lorenzo.pieralisi@arm.com>
Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
Acked-by: default avatarLiviu Dudau <liviu.dudau@arm.com>
CC: Arnd Bergmann <arnd@arndb.de>
CC: Rob Herring <robh+dt@kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent f42e86dc
...@@ -140,6 +140,7 @@ int of_pci_get_host_bridge_resources(struct device_node *dev, ...@@ -140,6 +140,7 @@ int of_pci_get_host_bridge_resources(struct device_node *dev,
unsigned char busno, unsigned char bus_max, unsigned char busno, unsigned char bus_max,
struct list_head *resources, resource_size_t *io_base) struct list_head *resources, resource_size_t *io_base)
{ {
struct pci_host_bridge_window *window;
struct resource *res; struct resource *res;
struct resource *bus_range; struct resource *bus_range;
struct of_pci_range range; struct of_pci_range range;
...@@ -225,7 +226,10 @@ int of_pci_get_host_bridge_resources(struct device_node *dev, ...@@ -225,7 +226,10 @@ int of_pci_get_host_bridge_resources(struct device_node *dev,
conversion_failed: conversion_failed:
kfree(res); kfree(res);
parse_failed: parse_failed:
list_for_each_entry(window, resources, list)
kfree(window->res);
pci_free_resource_list(resources); pci_free_resource_list(resources);
kfree(bus_range);
return err; return err;
} }
EXPORT_SYMBOL_GPL(of_pci_get_host_bridge_resources); EXPORT_SYMBOL_GPL(of_pci_get_host_bridge_resources);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment