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

pbrd: Fix memory leak

Browse Source 
On shutdown pbr was leaking the ifp->info ( struct pbr_interface *)
pointer.

Add some code to notice we are being shutdown and cleanup the memory

Signed-off-by: Donald Sharp <sharpd@nvidia.com>
This commit is contained in:
Donald Sharp 2020-10-22 20:53:07 -04:00
parent 1e4fa7f46c
commit 0e7d7358eb
5 changed files with 23 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pbrd/pbr_main.c
View File

@ -82,6 +82,8 @@ static void sigint(void)
{
zlog_notice("Terminating on signal");
pbr_vrf_terminate();
frr_fini();
exit(0);

12
pbrd/pbr_vrf.c
View File

@ -26,6 +26,7 @@
#include "pbr_map.h"
#include "pbr_debug.h"
#include "pbr_nht.h"
#include "pbr_zebra.h"
DEFINE_MTYPE_STATIC(PBRD, PBR_MAP_VRF, "PBR Map VRF")
@ -137,3 +138,14 @@ void pbr_vrf_init(void)
vrf_init(pbr_vrf_new, pbr_vrf_enable, pbr_vrf_disable, pbr_vrf_delete,
NULL);
}
void pbr_vrf_terminate(void)
{
struct vrf *vrf;
struct interface *ifp;
RB_FOREACH (vrf, vrf_name_head, &vrfs_by_name) {
FOR_ALL_INTERFACES (vrf, ifp)
pbr_if_del(ifp);
}
}

1
pbrd/pbr_vrf.h
View File

@ -40,4 +40,5 @@ extern bool pbr_vrf_is_valid(const struct pbr_vrf *pbr_vrf);
extern bool pbr_vrf_is_enabled(const struct pbr_vrf *pbr_vrf);
extern void pbr_vrf_init(void);
extern void pbr_vrf_terminate(void);
#endif

5
pbrd/pbr_zebra.c
View File

@ -59,6 +59,11 @@ struct pbr_interface *pbr_if_new(struct interface *ifp)
return pbr_ifp;
}
void pbr_if_del(struct interface *ifp)
{
XFREE(MTYPE_PBR_INTERFACE, ifp->info);
}
/* Inteface addition message from zebra. */
int pbr_ifp_create(struct interface *ifp)
{

3
pbrd/pbr_zebra.h
View File

@ -46,4 +46,7 @@ extern int pbr_ifp_up(struct interface *ifp);
extern int pbr_ifp_down(struct interface *ifp);
extern int pbr_ifp_destroy(struct interface *ifp);
/* Free the ifp->info pointer */
extern void pbr_if_del(struct interface *ifp);
#endif