proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-08 09:17:42 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

zebra: Cleanup leaked memory on shutdown from GR code

Browse Source 
Recent commit: 6b2554b94a
Exposed, via Address Sanitation, that memory was being
leaked.  Unfortunately the CI system did not catch this.

Two pieces of memory were being lost: The zserv client
data structure as well as anything on the client->gr_info_queue.
Clean these up.

Signed-off-by: Donald Sharp <sharpd@nvidia.com>
This commit is contained in:
Donald Sharp 2024-03-12 21:15:29 -04:00
parent dfa27764a2
commit 9ef76cff98
3 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
zebra/zebra_gr.c
View File

@ -298,6 +298,16 @@ struct zebra_gr_afi_clean {
* Functions to deal with capabilities * Functions to deal with capabilities
*/ */
void zebra_gr_client_final_shutdown(struct zserv *client)
{
struct client_gr_info *info;
while (!TAILQ_EMPTY(&client->gr_info_queue)) {
info = TAILQ_FIRST(&client->gr_info_queue);
zebra_gr_client_info_delete(client, info);
}
}
/* /*
* Function to decode and call appropriate functions * Function to decode and call appropriate functions
* to handle client capabilities. * to handle client capabilities.

6
zebra/zserv.c
View File

@ -675,10 +675,14 @@ static void zserv_client_free(struct zserv *client)
* If any instance are graceful restart enabled, * If any instance are graceful restart enabled,
* client is not deleted * client is not deleted
*/ */
if (DYNAMIC_CLIENT_GR_DISABLED(client)) { if (DYNAMIC_CLIENT_GR_DISABLED(client) || zebra_router_in_shutdown()) {
if (IS_ZEBRA_DEBUG_EVENT) if (IS_ZEBRA_DEBUG_EVENT)
zlog_debug("%s: Deleting client %s", __func__, zlog_debug("%s: Deleting client %s", __func__,
zebra_route_string(client->proto)); zebra_route_string(client->proto));
if (zebra_router_in_shutdown())
zebra_gr_client_final_shutdown(client);
zserv_client_delete(client); zserv_client_delete(client);
} else { } else {
/* Handle cases where client has GR instance. */ /* Handle cases where client has GR instance. */

1
zebra/zserv.h
View File

@ -378,6 +378,7 @@ __attribute__((__noreturn__)) void zebra_finalize(struct event *event);
/* /*
* Graceful restart functions. * Graceful restart functions.
*/ */
extern void zebra_gr_client_final_shutdown(struct zserv *client);
extern int zebra_gr_client_disconnect(struct zserv *client); extern int zebra_gr_client_disconnect(struct zserv *client);
extern void zebra_gr_client_reconnect(struct zserv *client); extern void zebra_gr_client_reconnect(struct zserv *client);
extern void zebra_gr_stale_client_cleanup(struct list *client_list); extern void zebra_gr_stale_client_cleanup(struct list *client_list);