bgpd: Validate as-path in show bgp regexp

Signed-off-by: Donatas Abraitis <donatas.abraitis@gmail.com>
FRRouting · Apr 23, 2019 · b36a179 · b36a179
1 parent 194cf1c
commit b36a179
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 1 deletion.
diff --git a/bgpd/bgp_filter.c b/bgpd/bgp_filter.c
@@ -391,7 +391,7 @@ static int as_list_dup_check(struct as_list *aslist, struct as_filter *new)
 	return 0;
 }
 
-static int config_bgp_aspath_validate(const char *regstr)
+int config_bgp_aspath_validate(const char *regstr)
 {
 	char valid_chars[] = "1234567890_^|[,{}() ]$*+.?-\\";
 

diff --git a/bgpd/bgp_filter.h b/bgpd/bgp_filter.h
@@ -31,5 +31,6 @@ extern enum as_filter_type as_list_apply(struct as_list *, void *);
 extern struct as_list *as_list_lookup(const char *);
 extern void as_list_add_hook(void (*func)(char *));
 extern void as_list_delete_hook(void (*func)(const char *));
+extern int config_bgp_aspath_validate(const char *regstr);
 
 #endif /* _QUAGGA_BGP_FILTER_H */
diff --git a/bgpd/bgp_route.c b/bgpd/bgp_route.c
@@ -9703,6 +9703,12 @@ static int bgp_show_regexp(struct vty *vty, struct bgp *bgp, const char *regstr,
 	regex_t *regex;
 	int rc;
 
+	if (!config_bgp_aspath_validate(regstr)) {
+		vty_out(vty, "Invalid character in as-path access-list %s\n",
+			regstr);
+		return CMD_WARNING_CONFIG_FAILED;
+	}
+
 	regex = bgp_regcomp(regstr);
 	if (!regex) {
 		vty_out(vty, "Can't compile regexp %s\n", regstr);