PCI/IA64: fix memleak for create pci root bus fail (c9e391cf) · Commits · e / devices / android_kernel_teracube_2e

arch/ia64/include/asm/pci.h

+5 −0

Original line number	Original line	Diff line number	Diff line
	@@ -89,6 +89,11 @@ extern int pci_mmap_legacy_page_range(struct pci_bus *bus,
	#define pci_legacy_read platform_pci_legacy_read		#define pci_legacy_read platform_pci_legacy_read
	#define pci_legacy_write platform_pci_legacy_write		#define pci_legacy_write platform_pci_legacy_write

			struct iospace_resource {
			struct list_head list;
			struct resource res;
			};

	struct pci_controller {		struct pci_controller {
	void *acpi_handle;		void *acpi_handle;
	void *iommu;		void *iommu;

arch/ia64/pci/pci.c

+60 −14

Original line number	Original line	Diff line number	Diff line
	@@ -137,6 +137,7 @@ struct pci_root_info {
	struct resource *res;		struct resource *res;
	resource_size_t *res_offset;		resource_size_t *res_offset;
	unsigned int res_num;		unsigned int res_num;
			struct list_head io_resources;
	char *name;		char *name;
	};		};

	@@ -171,25 +172,21 @@ new_space (u64 phys_base, int sparse)
	static u64 add_io_space(struct pci_root_info *info,		static u64 add_io_space(struct pci_root_info *info,
	struct acpi_resource_address64 *addr)		struct acpi_resource_address64 *addr)
	{		{
			struct iospace_resource *iospace;
	struct resource *resource;		struct resource *resource;
	char *name;		char *name;
	unsigned long base, min, max, base_port;		unsigned long base, min, max, base_port;
	unsigned int sparse = 0, space_nr, len;		unsigned int sparse = 0, space_nr, len;

	resource = kzalloc(sizeof(*resource), GFP_KERNEL);		len = strlen(info->name) + 32;
	if (!resource) {		iospace = kzalloc(sizeof(*iospace) + len, GFP_KERNEL);
			if (!iospace) {
	printk(KERN_ERR "PCI: No memory for %s I/O port space\n",		printk(KERN_ERR "PCI: No memory for %s I/O port space\n",
	info->name);		info->name);
	goto out;		goto out;
	}		}

	len = strlen(info->name) + 32;		name = (char *)(iospace + 1);
	name = kzalloc(len, GFP_KERNEL);
	if (!name) {
	printk(KERN_ERR "PCI: No memory for %s I/O port space name\n",
	info->name);
	goto free_resource;
	}

	min = addr->minimum;		min = addr->minimum;
	max = min + addr->address_length - 1;		max = min + addr->address_length - 1;
	@@ -198,7 +195,7 @@ static u64 add_io_space(struct pci_root_info *info,

	space_nr = new_space(addr->translation_offset, sparse);		space_nr = new_space(addr->translation_offset, sparse);
	if (space_nr == ~0)		if (space_nr == ~0)
	goto free_name;		goto free_resource;

	base = __pa(io_space[space_nr].mmio_base);		base = __pa(io_space[space_nr].mmio_base);
	base_port = IO_SPACE_BASE(space_nr);		base_port = IO_SPACE_BASE(space_nr);
	@@ -213,18 +210,23 @@ static u64 add_io_space(struct pci_root_info *info,
	if (space_nr == 0)		if (space_nr == 0)
	sparse = 1;		sparse = 1;

			resource = &iospace->res;
	resource->name = name;		resource->name = name;
	resource->flags = IORESOURCE_MEM;		resource->flags = IORESOURCE_MEM;
	resource->start = base + (sparse ? IO_SPACE_SPARSE_ENCODING(min) : min);		resource->start = base + (sparse ? IO_SPACE_SPARSE_ENCODING(min) : min);
	resource->end = base + (sparse ? IO_SPACE_SPARSE_ENCODING(max) : max);		resource->end = base + (sparse ? IO_SPACE_SPARSE_ENCODING(max) : max);
	insert_resource(&iomem_resource, resource);		if (insert_resource(&iomem_resource, resource)) {
			dev_err(&info->bridge->dev,
			"can't allocate host bridge io space resource %pR\n",
			resource);
			goto free_resource;
			}

			list_add_tail(&iospace->list, &info->io_resources);
	return base_port;		return base_port;

	free_name:
	kfree(name);
	free_resource:		free_resource:
	kfree(resource);		kfree(iospace);
	out:		out:
	return ~0;		return ~0;
	}		}
	@@ -325,6 +327,48 @@ static acpi_status add_window(struct acpi_resource res, void data)
	return AE_OK;		return AE_OK;
	}		}

			static void free_pci_root_info_res(struct pci_root_info *info)
			{
			struct iospace_resource iospace, tmp;

			list_for_each_entry_safe(iospace, tmp, &info->io_resources, list)
			kfree(iospace);

			kfree(info->name);
			kfree(info->res);
			info->res = NULL;
			kfree(info->res_offset);
			info->res_offset = NULL;
			info->res_num = 0;
			kfree(info->controller);
			info->controller = NULL;
			}

			static void __release_pci_root_info(struct pci_root_info *info)
			{
			int i;
			struct resource *res;
			struct iospace_resource *iospace;

			list_for_each_entry(iospace, &info->io_resources, list)
			release_resource(&iospace->res);

			for (i = 0; i < info->res_num; i++) {
			res = &info->res[i];

			if (!res->parent)
			continue;

			if (!(res->flags & (IORESOURCE_MEM \| IORESOURCE_IO)))
			continue;

			release_resource(res);
			}

			free_pci_root_info_res(info);
			kfree(info);
			}

	struct pci_bus pci_acpi_scan_root(struct acpi_pci_root root)		struct pci_bus pci_acpi_scan_root(struct acpi_pci_root root)
	{		{
	struct acpi_device *device = root->device;		struct acpi_device *device = root->device;
	@@ -357,6 +401,7 @@ struct pci_bus pci_acpi_scan_root(struct acpi_pci_root root)
	goto out2;		goto out2;
	}		}

			INIT_LIST_HEAD(&info->io_resources);
	INIT_LIST_HEAD(&info->resources);		INIT_LIST_HEAD(&info->resources);
	/* insert busn resource at first */		/* insert busn resource at first */
	pci_add_resource(&info->resources, &root->secondary);		pci_add_resource(&info->resources, &root->secondary);
	@@ -397,6 +442,7 @@ struct pci_bus pci_acpi_scan_root(struct acpi_pci_root root)
	&info->resources);		&info->resources);
	if (!pbus) {		if (!pbus) {
	pci_free_resource_list(&info->resources);		pci_free_resource_list(&info->resources);
			__release_pci_root_info(info);
	return NULL;		return NULL;
	}		}