Commit 0f12a4e2 authored Jan 13, 2011 by Ben Hutchings Committed by Jesse Barnes Feb 08, 2011

PCI: sysfs: Fix failure path for addition of "vpd" attribute



Commit 280c73d3 ("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>

parent 100b33c8

drivers/pci/pci-sysfs.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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;

Admin message