Skip to content

Commit eeb25a0

Browse files
committed
ata: ahci: Clean up sysfs file on error
.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>
1 parent ab9e0c5 commit eeb25a0

File tree

1 file changed

+12
-5
lines changed

1 file changed

+12
-5
lines changed

Diff for: drivers/ata/ahci.c

+12-5
Original file line numberDiff line numberDiff line change
@@ -1975,8 +1975,10 @@ static int ahci_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
19751975
n_ports = max(ahci_nr_ports(hpriv->cap), fls(hpriv->port_map));
19761976

19771977
host = ata_host_alloc_pinfo(&pdev->dev, ppi, n_ports);
1978-
if (!host)
1979-
return -ENOMEM;
1978+
if (!host) {
1979+
rc = -ENOMEM;
1980+
goto err_rm_sysfs_file;
1981+
}
19801982
host->private_data = hpriv;
19811983

19821984
if (ahci_init_msi(pdev, n_ports, hpriv) < 0) {
@@ -2031,11 +2033,11 @@ static int ahci_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
20312033
/* initialize adapter */
20322034
rc = ahci_configure_dma_masks(pdev, hpriv);
20332035
if (rc)
2034-
return rc;
2036+
goto err_rm_sysfs_file;
20352037

20362038
rc = ahci_pci_reset_controller(host);
20372039
if (rc)
2038-
return rc;
2040+
goto err_rm_sysfs_file;
20392041

20402042
ahci_pci_init_controller(host);
20412043
ahci_pci_print_info(host);
@@ -2044,10 +2046,15 @@ static int ahci_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
20442046

20452047
rc = ahci_host_activate(host, &ahci_sht);
20462048
if (rc)
2047-
return rc;
2049+
goto err_rm_sysfs_file;
20482050

20492051
pm_runtime_put_noidle(&pdev->dev);
20502052
return 0;
2053+
2054+
err_rm_sysfs_file:
2055+
sysfs_remove_file_from_group(&pdev->dev.kobj,
2056+
&dev_attr_remapped_nvme.attr, NULL);
2057+
return rc;
20512058
}
20522059

20532060
static void ahci_shutdown_one(struct pci_dev *pdev)

0 commit comments

Comments
 (0)