| Message ID | 6223773b71e374192af341361055c0124df7083c.1627991916.git.leonro@nvidia.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 13a9c4ac319a23c792e2e03ac73777b6710132c3 |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | [net] net/prestera: Fix devlink groups leakage in error flow | expand |
| Context | Check | Description |
|---|---|---|
| netdev/cover_letter | success | Link |
| netdev/fixes_present | success | Link |
| netdev/patch_count | success | Link |
| netdev/tree_selection | success | Clearly marked for net |
| netdev/subject_prefix | success | Link |
| netdev/cc_maintainers | success | CCed 6 of 6 maintainers |
| netdev/source_inline | success | Was 0 now: 0 |
| netdev/verify_signedoff | success | Link |
| netdev/module_param | success | Was 0 now: 0 |
| netdev/build_32bit | success | Errors and warnings before: 0 this patch: 0 |
| netdev/kdoc | success | Errors and warnings before: 0 this patch: 0 |
| netdev/verify_fixes | success | Link |
| netdev/checkpatch | success | total: 0 errors, 0 warnings, 0 checks, 8 lines checked |
| netdev/build_allmodconfig_warn | success | Errors and warnings before: 0 this patch: 0 |
| netdev/header_inline | success | Link |
Hello: This patch was applied to netdev/net.git (refs/heads/master): On Tue, 3 Aug 2021 15:00:43 +0300 you wrote: > From: Leon Romanovsky <leonro@nvidia.com> > > Devlink trap group is registered but not released in error flow, > add the missing devlink_trap_groups_unregister() call. > > Fixes: 0a9003f45e91 ("net: marvell: prestera: devlink: add traps/groups implementation") > Signed-off-by: Leon Romanovsky <leonro@nvidia.com> > > [...] Here is the summary with links: - [net] net/prestera: Fix devlink groups leakage in error flow https://git.kernel.org/netdev/net/c/13a9c4ac319a You are awesome, thank you! -- Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html
diff --git a/drivers/net/ethernet/marvell/prestera/prestera_devlink.c b/drivers/net/ethernet/marvell/prestera/prestera_devlink.c index d12e21db9fd6..fa7a0682ad1e 100644 --- a/drivers/net/ethernet/marvell/prestera/prestera_devlink.c +++ b/drivers/net/ethernet/marvell/prestera/prestera_devlink.c @@ -530,6 +530,8 @@ static int prestera_devlink_traps_register(struct prestera_switch *sw) prestera_trap = &prestera_trap_items_arr[i]; devlink_traps_unregister(devlink, &prestera_trap->trap, 1); } + devlink_trap_groups_unregister(devlink, prestera_trap_groups_arr, + groups_count); err_groups_register: kfree(trap_data->trap_items_arr); err_trap_items_alloc: