Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-08 20:21:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'pci/sysfs'

Browse Source 
- 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
This commit is contained in:
Bjorn Helgaas 2022-12-10 10:36:35 -06:00
commit 0084cd6072
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
drivers/pci/pci-sysfs.c
View File

@ -1175,11 +1175,9 @@ static int pci_create_attr(struct pci_dev *pdev, int num, int write_combine)
sysfs_bin_attr_init(res_attr); sysfs_bin_attr_init(res_attr);
if (write_combine) { if (write_combine) {
pdev->res_attr_wc[num] = res_attr;
sprintf(res_attr_name, "resource%d_wc", num); sprintf(res_attr_name, "resource%d_wc", num);
res_attr->mmap = pci_mmap_resource_wc; res_attr->mmap = pci_mmap_resource_wc;
} else { } else {
pdev->res_attr[num] = res_attr;
sprintf(res_attr_name, "resource%d", num); sprintf(res_attr_name, "resource%d", num);
if (pci_resource_flags(pdev, num) & IORESOURCE_IO) { if (pci_resource_flags(pdev, num) & IORESOURCE_IO) {
res_attr->read = pci_read_resource_io; res_attr->read = pci_read_resource_io;
@ -1197,10 +1195,17 @@ static int pci_create_attr(struct pci_dev *pdev, int num, int write_combine)
res_attr->size = pci_resource_len(pdev, num); res_attr->size = pci_resource_len(pdev, num);
res_attr->private = (void *)(unsigned long)num; res_attr->private = (void *)(unsigned long)num;
retval = sysfs_create_bin_file(&pdev->dev.kobj, res_attr); retval = sysfs_create_bin_file(&pdev->dev.kobj, res_attr);
if (retval) if (retval) {
kfree(res_attr); kfree(res_attr);
return retval;
}
return retval; if (write_combine)
pdev->res_attr_wc[num] = res_attr;
else
pdev->res_attr[num] = res_attr;
return 0;
} }
/** /**