Merge pull request #9057 from FRRouting/mergify/bp/dev/8.0/pr-9051

ton31337 · web-flow · commit 180f4c1d8ba2 · 2021-07-15T10:58:20.000+03:00
bgpd: fix crash during configuration removal (backport #9051)
diff --git a/bgpd/bgp_bfd.c b/bgpd/bgp_bfd.c
@@ -326,7 +326,9 @@ static void bgp_peer_remove_bfd(struct peer *p)
 		return;
 	}
 
-	bfd_sess_free(&p->bfd_config->session);
+	if (p->bfd_config)
+		bfd_sess_free(&p->bfd_config->session);
+
 	XFREE(MTYPE_BFD_CONFIG, p->bfd_config);
 }
 

Original file line number	Diff line number	Diff line change
`@@ -326,7 +326,9 @@ static void bgp_peer_remove_bfd(struct peer *p)`
`326`	`326`	`return;`
`327`	`327`	`}`
`328`	`328`
`329`		`- bfd_sess_free(&p->bfd_config->session);`
	`329`	`+ if (p->bfd_config)`
	`330`	`+ bfd_sess_free(&p->bfd_config->session);`
	`331`	`+`
`330`	`332`	`XFREE(MTYPE_BFD_CONFIG, p->bfd_config);`
`331`	`333`	`}`
`332`	`334`