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>

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>
Ben Hutchings · Jesse Barnes
1 parent 100b33c8bd
Showing 1 changed file with 1 additions and 1 deletions Side-by-side Diff
drivers/pci/pci-sysfs.c
@@ -1087,7 +1087,7 @@
 		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;
...	...	@@ -1087,7 +1087,7 @@
1087	1087	attr->write = write_vpd_attr;
1088	1088	retval = sysfs_create_bin_file(&dev->dev.kobj, attr);
1089	1089	if (retval) {
1090		- kfree(dev->vpd->attr);
	1090	+ kfree(attr);
1091	1091	return retval;
1092	1092	}
1093	1093	dev->vpd->attr = attr;