summaryrefslogtreecommitdiff
path: root/drivers/pci
diff options
context:
space:
mode:
authorBen Hutchings <bhutchings@solarflare.com>2011-01-13 19:47:56 +0000
committerJesse Barnes <jbarnes@virtuousgeek.org>2011-02-08 10:02:46 -0800
commit0f12a4e29368a9476076515881d9ef4e5876c6e2 (patch)
treecb58b69f498d132aab3a68f8fb259520ef3c3934 /drivers/pci
parent100b33c8bd8a3235fd0b7948338d6cbb3db3c63d (diff)
downloadlinux-3.10-0f12a4e29368a9476076515881d9ef4e5876c6e2.tar.gz
linux-3.10-0f12a4e29368a9476076515881d9ef4e5876c6e2.tar.bz2
linux-3.10-0f12a4e29368a9476076515881d9ef4e5876c6e2.zip
PCI: sysfs: Fix failure path for addition of "vpd" attribute
Commit 280c73d ("PCI: centralize the capabilities code in pci-sysfs.c") changed the initialisation of the "rom" and "vpd" attributes, and made the failure path for the "vpd" attribute incorrect. We must free the new attribute structure (attr), but instead we currently free dev->vpd->attr. That will normally be NULL, resulting in a memory leak, but it might be a stale pointer, resulting in a double-free. Found by inspection; compile-tested only. Cc: stable@kernel.org Signed-off-by: Ben Hutchings <bhutchings@solarflare.com> Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
Diffstat (limited to 'drivers/pci')
-rw-r--r--drivers/pci/pci-sysfs.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pci/pci-sysfs.c b/drivers/pci/pci-sysfs.c
index 8ecaac98392..cf2b3654b4a 100644
--- a/drivers/pci/pci-sysfs.c
+++ b/drivers/pci/pci-sysfs.c
@@ -1087,7 +1087,7 @@ static int pci_create_capabilities_sysfs(struct pci_dev *dev)
attr->write = write_vpd_attr;
retval = sysfs_create_bin_file(&dev->dev.kobj, attr);
if (retval) {
- kfree(dev->vpd->attr);
+ kfree(attr);
return retval;
}
dev->vpd->attr = attr;