Merge pull request #19629 from donaldsharp/bmpe_leaked

ton31337 · web-flow · commit 8f56705c1014 · 2025-09-28T18:30:43.000+03:00
bgpd: Free up leaked bpme on release
diff --git a/bgpd/bgp_pbr.c b/bgpd/bgp_pbr.c
@@ -1683,6 +1683,9 @@ static void bgp_pbr_flush_iprule(struct bgp *bgp, struct bgp_pbr_action *bpa,
 	bgp_pbr_bpa_remove(bpa);
 }
 
+/*
+ * This function frees the bpme that is passed in
+ */
 static void bgp_pbr_flush_entry(struct bgp *bgp, struct bgp_pbr_action *bpa,
 				struct bgp_pbr_match *bpm,
 				struct bgp_pbr_match_entry *bpme)
@@ -1730,6 +1733,8 @@ static void bgp_pbr_flush_entry(struct bgp *bgp, struct bgp_pbr_action *bpa,
 		 * note that drop does not need to call send_pbr_action
 		 */
 	}
+
+	bgp_pbr_match_entry_free(bpme);
 	bgp_pbr_bpa_remove(bpa);
 }
 

Original file line number	Diff line number	Diff line change
`@@ -1683,6 +1683,9 @@ static void bgp_pbr_flush_iprule(struct bgp bgp, struct bgp_pbr_action bpa,`
`1683`	`1683`	`bgp_pbr_bpa_remove(bpa);`
`1684`	`1684`	`}`
`1685`	`1685`
	`1686`	`+/*`
	`1687`	`+ * This function frees the bpme that is passed in`
	`1688`	`+ */`
`1686`	`1689`	`static void bgp_pbr_flush_entry(struct bgp bgp, struct bgp_pbr_action bpa,`
`1687`	`1690`	`struct bgp_pbr_match *bpm,`
`1688`	`1691`	`struct bgp_pbr_match_entry *bpme)`
`@@ -1730,6 +1733,8 @@ static void bgp_pbr_flush_entry(struct bgp bgp, struct bgp_pbr_action bpa,`
`1730`	`1733`	`* note that drop does not need to call send_pbr_action`
`1731`	`1734`	`*/`
`1732`	`1735`	`}`
	`1736`	`+`
	`1737`	`+ bgp_pbr_match_entry_free(bpme);`
`1733`	`1738`	`bgp_pbr_bpa_remove(bpa);`
`1734`	`1739`	`}`
`1735`	`1740`