Commit 0084cd60 authored by Bjorn Helgaas's avatar Bjorn Helgaas
Browse files

Merge branch 'pci/sysfs' 

- Fix a double free in the error path of creating sysfs "resource%d"
  attributes (Sascha Hauer)

* pci/sysfs:
  PCI/sysfs: Fix double free in error path
parents 8961fc4f aa382ffa

drivers/pci/pci-sysfs.c

+9 −4
Original line number Diff line number Diff line
@@ -1175,11 +1175,9 @@ static int pci_create_attr(struct pci_dev *pdev, int num, int write_combine) 


	sysfs_bin_attr_init(res_attr);

	if (write_combine) {

		pdev->res_attr_wc[num] = res_attr;

		sprintf(res_attr_name, "resource%d_wc", num);

		res_attr->mmap = pci_mmap_resource_wc;

	} else {

		pdev->res_attr[num] = res_attr;

		sprintf(res_attr_name, "resource%d", num);

		if (pci_resource_flags(pdev, num) & IORESOURCE_IO) {

			res_attr->read = pci_read_resource_io;
@@ -1197,12 +1195,19 @@ static int pci_create_attr(struct pci_dev *pdev, int num, int write_combine) 
	res_attr->size = pci_resource_len(pdev, num);

	res_attr->private = (void *)(unsigned long)num;

	retval = sysfs_create_bin_file(&pdev->dev.kobj, res_attr);

	if (retval)

	if (retval) {

		kfree(res_attr);



		return retval;

	}



	if (write_combine)

		pdev->res_attr_wc[num] = res_attr;

	else

		pdev->res_attr[num] = res_attr;



	return 0;

}



/**

 * pci_create_resource_files - create resource files in sysfs for @dev

 * @pdev: dev in question