net/prestera: Fix devlink groups leakage in error flow

rleon · davem330 · commit 13a9c4ac319a · 2021-08-04T10:00:36.000+01:00
Devlink trap group is registered but not released in error flow, add the missing devlink_trap_groups_unregister() call. Fixes: 0a9003f ("net: marvell: prestera: devlink: add traps/groups implementation") Signed-off-by: Leon Romanovsky <leonro@nvidia.com> Signed-off-by: David S. Miller <davem@davemloft.net>
diff --git 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:

Original file line number	Diff line number	Diff line change
`@@ -530,6 +530,8 @@ static int prestera_devlink_traps_register(struct prestera_switch *sw)`
`530`	`530`	`prestera_trap = &prestera_trap_items_arr[i];`
`531`	`531`	`devlink_traps_unregister(devlink, &prestera_trap->trap, 1);`
`532`	`532`	`}`
	`533`	`+ devlink_trap_groups_unregister(devlink, prestera_trap_groups_arr,`
	`534`	`+ groups_count);`
`533`	`535`	`err_groups_register:`
`534`	`536`	`kfree(trap_data->trap_items_arr);`
`535`	`537`	`err_trap_items_alloc:`