PCI: endpoint: Fix configfs group removal on driver teardown
Subsystems (2)
PATCH 1/1 PCI: endpoint: Fix configfs group removal on driver teardown
An endpoint driver configfs attributes group is added to the epf_group list of struct pci_epf_driver pci_epf_add_cfs() but not removed from this list when the attribute group is unregistered with pci_ep_cfs_remove_epf_group(). Add the missing list_del_init() call in that function to correctly remove the attribute group from the driver list.
Furthermore, doing a list_del() on the epf_group field of struct pci_epf_driver in pci_epf_remove_cfs() is not correct as this field is a list head, not a list entry, and triggers a KASAN warning:
==================================================================
BUG: KASAN: slab-use-after-free in pci_epf_remove_cfs+0x17c/0x198 Write of size 8 at addr ffff00010f4a0d80 by task rmmod/319 CPU: 3 UID: 0 PID: 319 Comm: rmmod Not tainted 6.16.0-rc2 #1 NONE Hardware name: Radxa ROCK 5B (DT) Call trace: show_stack+0x2c/0x84 (C) dump_stack_lvl+0x70/0x98 print_report+0x17c/0x538 kasan_report+0xb8/0x190 __asan_report_store8_noabort+0x20/0x2c pci_epf_remove_cfs+0x17c/0x198 pci_epf_unregister_driver+0x18/0x30 nvmet_pci_epf_cleanup_module+0x24/0x30 [nvmet_pci_epf] __arm64_sys_delete_module+0x264/0x424 invoke_syscall+0x70/0x260 el0_svc_common.constprop.0+0xac/0x230 do_el0_svc+0x40/0x58 el0_svc+0x48/0xdc el0t_64_sync_handler+0x10c/0x138 el0t_64_sync+0x198/0x19c
...
Remove this list_del() call from pci_epf_remove_cfs() and replace it with a warning if the epf_group list is not empty.
--- drivers/pci/endpoint/pci-ep-cfs.c | 1 + drivers/pci/endpoint/pci-epf-core.c | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-)
drivers/pci/endpoint/pci-ep-cfs.c +1 -0
@@ -691,6 +691,7 @@ void pci_ep_cfs_remove_epf_group(struct config_group *group)if (IS_ERR_OR_NULL (group))return ; +list_del_init (&group->group_entry);configfs_unregister_default_group (group); }EXPORT_SYMBOL (pci_ep_cfs_remove_epf_group);
drivers/pci/endpoint/pci-epf-core.c +1 -1
@@ -338,7 +338,7 @@ static void pci_epf_remove_cfs(struct pci_epf_driver *driver)mutex_lock (&pci_epf_mutex);list_for_each_entry_safe (group, tmp, &driver->epf_group, group_entry)pci_ep_cfs_remove_epf_group (group); -list_del (&driver->epf_group); +WARN_ON (!list_empty (&driver->epf_group));mutex_unlock (&pci_epf_mutex); }
Signature · 1 line
2.49.0
Quoted 10 lines · Damien Le Moal
An endpoint driver configfs attributes group is added to the
epf_grouplist of structpci_epf_driverpci_epf_add_cfs()but not removed from this list when the attribute group is unregistered withpci_ep_cfs_remove_epf_group(). Add the missinglist_del_init()call in that function to correctly remove the attribute group from the driver list.Furthermore, doing a
list_del()on theepf_groupfield of structpci_epf_driverinpci_epf_remove_cfs()is not correct as this field is a list head, not a list entry, and triggers a KASAN warning:
Ping ?
Quoted 61 lines
==================================================================
BUG: KASAN: slab-use-after-free in pci_epf_remove_cfs+0x17c/0x198 Write of size 8 at addr ffff00010f4a0d80 by task rmmod/319 CPU: 3 UID: 0 PID: 319 Comm: rmmod Not tainted 6.16.0-rc2 #1 NONE Hardware name: Radxa ROCK 5B (DT) Call trace: show_stack+0x2c/0x84 (C) dump_stack_lvl+0x70/0x98 print_report+0x17c/0x538 kasan_report+0xb8/0x190 __asan_report_store8_noabort+0x20/0x2c pci_epf_remove_cfs+0x17c/0x198 pci_epf_unregister_driver+0x18/0x30 nvmet_pci_epf_cleanup_module+0x24/0x30 [nvmet_pci_epf] __arm64_sys_delete_module+0x264/0x424 invoke_syscall+0x70/0x260 el0_svc_common.constprop.0+0xac/0x230 do_el0_svc+0x40/0x58 el0_svc+0x48/0xdc el0t_64_sync_handler+0x10c/0x138 el0t_64_sync+0x198/0x19c...
Remove this
list_del()call frompci_epf_remove_cfs()and replace it with a warning if theepf_grouplist is not empty.Fixes ef1433f717a2 ("PCI: endpoint: Create configfs entry for each pci_epf_device_id table entry")Signed-off-by Damien Le Moal <[email protected]>--- drivers/pci/endpoint/pci-ep-cfs.c | 1 + drivers/pci/endpoint/pci-epf-core.c | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-)drivers/pci/endpoint/pci-ep-cfs.c +1
-0@@ -691,6 +691,7 @@ void pci_ep_cfs_remove_epf_group(struct config_group *group)if (IS_ERR_OR_NULL (group))return ; +list_del_init (&group->group_entry);configfs_unregister_default_group (group); }EXPORT_SYMBOL (pci_ep_cfs_remove_epf_group);drivers/pci/endpoint/pci-epf-core.c +1
-1@@ -338,7 +338,7 @@ static void pci_epf_remove_cfs(struct pci_epf_driver *driver)mutex_lock (&pci_epf_mutex);list_for_each_entry_safe (group, tmp, &driver->epf_group, group_entry)pci_ep_cfs_remove_epf_group (group); -list_del (&driver->epf_group); +WARN_ON (!list_empty (&driver->epf_group));mutex_unlock (&pci_epf_mutex); }
Signature · 2 lines
Damien Le Moal Western Digital Research
Hello Damien,
Quoted 6 lines · Damien Le Moal
An endpoint driver configfs attributes group is added to the
epf_grouplist of structpci_epf_driverpci_epf_add_cfs()but not removed from this list when the attribute group is unregistered withpci_ep_cfs_remove_epf_group(). Add the missinglist_del_init()call in that function to correctly remove the attribute group from the driver list.
This seems like a bug (bug #1).
Quoted 4 lines
Furthermore, doing a
list_del()on theepf_groupfield of structpci_epf_driverinpci_epf_remove_cfs()is not correct as this field is a list head, not a list entry, and triggers a KASAN warning:
This seems like another bug (bug #2).
I do understand that both bugs were introduced by the same commit.
However, since it is two separate bugs, I personally think that they deserve two separate patches (even if they will have the same Fixes tag).
Quoted 15 lines
==================================================================
BUG: KASAN: slab-use-after-free in pci_epf_remove_cfs+0x17c/0x198 Write of size 8 at addr ffff00010f4a0d80 by task rmmod/319 CPU: 3 UID: 0 PID: 319 Comm: rmmod Not tainted 6.16.0-rc2 #1 NONE Hardware name: Radxa ROCK 5B (DT) Call trace: show_stack+0x2c/0x84 (C) dump_stack_lvl+0x70/0x98 print_report+0x17c/0x538 kasan_report+0xb8/0x190 __asan_report_store8_noabort+0x20/0x2c pci_epf_remove_cfs+0x17c/0x198 pci_epf_unregister_driver+0x18/0x30
Quoted 8 lines
nvmet_pci_epf_cleanup_module+0x24/0x30 [nvmet_pci_epf] __arm64_sys_delete_module+0x264/0x424 invoke_syscall+0x70/0x260 el0_svc_common.constprop.0+0xac/0x230 do_el0_svc+0x40/0x58 el0_svc+0x48/0xdc el0t_64_sync_handler+0x10c/0x138 el0t_64_sync+0x198/0x19c
This KASAN splat seems to belong to bug #2.
I think it is a litte bit confusing that you attach a KASAN splat to a patch that fixes two different bugs.
Surely this KASAN bug can be fixes with only:
- list_del(&driver->epf_group);
+ WARN_ON(!list_empty(&driver->epf_group));
So I think it would make more sense if the patch that fixes the KASAN splat includes only the changes that are needed to fix the KASAN splat, and then for the other bug, create a different patch that will then have a clearer commit message (because it will not have an unrelated KASAN splat in it).
Kind regards,
Niklas
Quoted 59 lines · Niklas Cassel
Hello Damien,
Quoted 6 lines · Damien Le Moal
An endpoint driver configfs attributes group is added to the
epf_grouplist of structpci_epf_driverpci_epf_add_cfs()but not removed from this list when the attribute group is unregistered withpci_ep_cfs_remove_epf_group(). Add the missinglist_del_init()call in that function to correctly remove the attribute group from the driver list.This seems like a bug (bug #1).
Quoted 4 lines
Furthermore, doing a
list_del()on theepf_groupfield of structpci_epf_driverinpci_epf_remove_cfs()is not correct as this field is a list head, not a list entry, and triggers a KASAN warning:This seems like another bug (bug #2).
I do understand that both bugs were introduced by the same commit.
However, since it is two separate bugs, I personally think that they deserve two separate patches (even if they will have the same Fixes tag).
Quoted 15 lines
==================================================================
BUG: KASAN: slab-use-after-free in pci_epf_remove_cfs+0x17c/0x198 Write of size 8 at addr ffff00010f4a0d80 by task rmmod/319 CPU: 3 UID: 0 PID: 319 Comm: rmmod Not tainted 6.16.0-rc2 #1 NONE Hardware name: Radxa ROCK 5B (DT) Call trace: show_stack+0x2c/0x84 (C) dump_stack_lvl+0x70/0x98 print_report+0x17c/0x538 kasan_report+0xb8/0x190 __asan_report_store8_noabort+0x20/0x2c pci_epf_remove_cfs+0x17c/0x198 pci_epf_unregister_driver+0x18/0x30Quoted 8 lines
nvmet_pci_epf_cleanup_module+0x24/0x30 [nvmet_pci_epf] __arm64_sys_delete_module+0x264/0x424 invoke_syscall+0x70/0x260 el0_svc_common.constprop.0+0xac/0x230 do_el0_svc+0x40/0x58 el0_svc+0x48/0xdc el0t_64_sync_handler+0x10c/0x138 el0t_64_sync+0x198/0x19cThis KASAN splat seems to belong to bug #2.
I think it is a litte bit confusing that you attach a KASAN splat to a patch that fixes two different bugs.
Surely this KASAN bug can be fixes with only:
drivers/pci/endpoint/pci-epf-core.c static void pci_epf_remove_cfs(struct pci_epf_driver *driver) · line 341
Quoted 2 lines
drivers/pci/endpoint/pci-epf-core.c +1
-1-list_del (&driver->epf_group); +WARN_ON (!list_empty (&driver->epf_group));
Yes, with that, you will not get the KASAN warning, but you will get the WARN_ON() to trigger unless bug #1 is applied first. But if you apply #1 first, then any testing done with that bug fix only will trigger a NULL pointer de-reference on the list_del().
For this reason, I very much dislike the idea of splitting this patch into 2 different patches as the bugs are inter-dependent.
Unless Mani insists on a split, I will not do it.
Quoted 4 lines
So I think it would make more sense if the patch that fixes the KASAN splat includes only the changes that are needed to fix the KASAN splat, and then for the other bug, create a different patch that will then have a clearer commit message (because it will not have an unrelated KASAN splat in it).
Again, no. I do not like this idea. I can improve the commit message to explain that more clearly though.
Signature · 2 lines
Damien Le Moal Western Digital Research
Quoted 7 lines · Damien Le Moal
Quoted 6 lines · Niklas Cassel
I think it is a litte bit confusing that you attach a KASAN splat to a patch that fixes two different bugs.
Surely this KASAN bug can be fixes with only:
Quoted 7 lines
drivers/pci/endpoint/pci-epf-core.c static void pci_epf_remove_cfs(struct pci_epf_driver *driver) · line 341
Quoted 2 lines
drivers/pci/endpoint/pci-epf-core.c +1
-1-list_del (&driver->epf_group); +WARN_ON (!list_empty (&driver->epf_group));Yes, with that, you will not get the KASAN warning, but you will get the
WARN_ON()to trigger unless bug #1 is applied first. But if you apply #1 first, then any testing done with that bug fix only will trigger a NULL pointer de-reference on thelist_del().
Ok, let me rephrase :)
Surely this KASAN bug can be fixed with only:
- list_del(&driver->epf_group);
As the bug is that the code is trying to delete a list head, which is just wrong.
A patch 2/2 could add a list_del() to pci_ep_cfs_remove_epf_group() and the WARN_ON() to pci_epf_remove_cfs().
Considering that pci_ep_cfs_remove_epf_group() also frees the memory for the group, I think it is more correct to use list_del() rather than list_del_init(), as no one will be able to re-use this group after calling pci_ep_cfs_remove_epf_group() on it.
Kind regards,
Niklas
Quoted 26 lines · Niklas Cassel
Quoted 7 lines · Damien Le Moal
Quoted 6 lines · Niklas Cassel
I think it is a litte bit confusing that you attach a KASAN splat to a patch that fixes two different bugs.
Surely this KASAN bug can be fixes with only:
Quoted 7 lines
drivers/pci/endpoint/pci-epf-core.c static void pci_epf_remove_cfs(struct pci_epf_driver *driver) · line 341
Quoted 2 lines
drivers/pci/endpoint/pci-epf-core.c +1
-1-list_del (&driver->epf_group); +WARN_ON (!list_empty (&driver->epf_group));Yes, with that, you will not get the KASAN warning, but you will get the
WARN_ON()to trigger unless bug #1 is applied first. But if you apply #1 first, then any testing done with that bug fix only will trigger a NULL pointer de-reference on thelist_del().Ok, let me rephrase :)
Surely this KASAN bug can be fixed with only:
-
list_del(&driver->epf_group);As the bug is that the code is trying to delete a list head, which is just wrong.
Quoted 7 lines
A patch 2/2 could add a
list_del()topci_ep_cfs_remove_epf_group()and theWARN_ON()topci_epf_remove_cfs().Considering that
pci_ep_cfs_remove_epf_group()also frees the memory for the group, I think it is more correct to uselist_del()rather thanlist_del_init(), as no one will be able to re-use this group after callingpci_ep_cfs_remove_epf_group()on it.
OK. Sending v2.
Signature · 2 lines
Damien Le Moal Western Digital Research