Skip to content

Commit be5016a

Browse files
floatiousgregkh
authored andcommitted
ata: ahci: Clean up sysfs file on error
commit eeb25a0 upstream. .probe() (ahci_init_one()) calls sysfs_add_file_to_group(), however, if probe() fails after this call, we currently never call sysfs_remove_file_from_group(). (The sysfs_remove_file_from_group() call in .remove() (ahci_remove_one()) does not help, as .remove() is not called on .probe() error.) Thus, if probe() fails after the sysfs_add_file_to_group() call, the next time we insmod the module we will get: sysfs: cannot create duplicate filename '/devices/pci0000:00/0000:00:04.0/remapped_nvme' CPU: 11 PID: 954 Comm: modprobe Not tainted 6.10.0-rc5 #43 Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS 1.16.3-2.fc40 04/01/2014 Call Trace: <TASK> dump_stack_lvl+0x5d/0x80 sysfs_warn_dup.cold+0x17/0x23 sysfs_add_file_mode_ns+0x11a/0x130 sysfs_add_file_to_group+0x7e/0xc0 ahci_init_one+0x31f/0xd40 [ahci] Fixes: 894fba7 ("ata: ahci: Add sysfs attribute to show remapped NVMe device count") Cc: stable@vger.kernel.org Reviewed-by: Damien Le Moal <dlemoal@kernel.org> Reviewed-by: Hannes Reinecke <hare@suse.de> Link: https://lore.kernel.org/r/20240629124210.181537-10-cassel@kernel.org Signed-off-by: Niklas Cassel <cassel@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent 692858d commit be5016a

File tree

1 file changed

+12
-5
lines changed

1 file changed

+12
-5
lines changed

drivers/ata/ahci.c

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1893,8 +1893,10 @@ static int ahci_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
18931893
n_ports = max(ahci_nr_ports(hpriv->cap), fls(hpriv->port_map));
18941894

18951895
host = ata_host_alloc_pinfo(&pdev->dev, ppi, n_ports);
1896-
if (!host)
1897-
return -ENOMEM;
1896+
if (!host) {
1897+
rc = -ENOMEM;
1898+
goto err_rm_sysfs_file;
1899+
}
18981900
host->private_data = hpriv;
18991901

19001902
if (ahci_init_msi(pdev, n_ports, hpriv) < 0) {
@@ -1947,11 +1949,11 @@ static int ahci_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
19471949
/* initialize adapter */
19481950
rc = ahci_configure_dma_masks(pdev, hpriv);
19491951
if (rc)
1950-
return rc;
1952+
goto err_rm_sysfs_file;
19511953

19521954
rc = ahci_pci_reset_controller(host);
19531955
if (rc)
1954-
return rc;
1956+
goto err_rm_sysfs_file;
19551957

19561958
ahci_pci_init_controller(host);
19571959
ahci_pci_print_info(host);
@@ -1960,10 +1962,15 @@ static int ahci_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
19601962

19611963
rc = ahci_host_activate(host, &ahci_sht);
19621964
if (rc)
1963-
return rc;
1965+
goto err_rm_sysfs_file;
19641966

19651967
pm_runtime_put_noidle(&pdev->dev);
19661968
return 0;
1969+
1970+
err_rm_sysfs_file:
1971+
sysfs_remove_file_from_group(&pdev->dev.kobj,
1972+
&dev_attr_remapped_nvme.attr, NULL);
1973+
return rc;
19671974
}
19681975

19691976
static void ahci_shutdown_one(struct pci_dev *pdev)

0 commit comments

Comments
 (0)