Skip to content

Commit 315b964

Browse files
damien-lemoalgregkh
authored andcommitted
PCI: endpoint: Fix configfs group removal on driver teardown
commit 910bdb8 upstream. An endpoint driver configfs attributes group is added to the epf_group list of struct pci_epf_driver by pci_epf_add_cfs() but an added group is not removed from this list when the attribute group is unregistered with pci_ep_cfs_remove_epf_group(). Add the missing list_del() call in pci_ep_cfs_remove_epf_group() to correctly remove the attribute group from the driver list. With this change, once the loop over all attribute groups in pci_epf_remove_cfs() completes, the driver epf_group list should be empty. Add a WARN_ON() to make sure of that. Fixes: ef1433f ("PCI: endpoint: Create configfs entry for each pci_epf_device_id table entry") Signed-off-by: Damien Le Moal <dlemoal@kernel.org> Signed-off-by: Manivannan Sadhasivam <mani@kernel.org> Reviewed-by: Niklas Cassel <cassel@kernel.org> Cc: stable@vger.kernel.org Link: https://patch.msgid.link/20250624114544.342159-3-dlemoal@kernel.org Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent a302bd8 commit 315b964

File tree

2 files changed

+2
-0
lines changed

2 files changed

+2
-0
lines changed

drivers/pci/endpoint/pci-ep-cfs.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -691,6 +691,7 @@ void pci_ep_cfs_remove_epf_group(struct config_group *group)
691691
if (IS_ERR_OR_NULL(group))
692692
return;
693693

694+
list_del(&group->group_entry);
694695
configfs_unregister_default_group(group);
695696
}
696697
EXPORT_SYMBOL(pci_ep_cfs_remove_epf_group);

drivers/pci/endpoint/pci-epf-core.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -338,6 +338,7 @@ static void pci_epf_remove_cfs(struct pci_epf_driver *driver)
338338
mutex_lock(&pci_epf_mutex);
339339
list_for_each_entry_safe(group, tmp, &driver->epf_group, group_entry)
340340
pci_ep_cfs_remove_epf_group(group);
341+
WARN_ON(!list_empty(&driver->epf_group));
341342
mutex_unlock(&pci_epf_mutex);
342343
}
343344

0 commit comments

Comments
 (0)