Merge pull request #16062 from FRRouting/mergify/bp/stable/9.0/pr-16032

zebra: Deny the routes if ip protocol CLI refers to an undefined rmap (backport #16032)
FRRouting · May 21, 2024 · 427e908 · 427e908
2 parents 0cca493 + 17f037f
commit 427e908
Showing 1 changed file with 2 additions and 3 deletions.
diff --git a/zebra/zebra_routemap.c b/zebra/zebra_routemap.c
@@ -305,8 +305,7 @@ static int ip_protocol_rm_add(struct zebra_vrf *zvrf, const char *rmap,
  route_map_lookup_by_name(PROTO_RM_NAME(zvrf, afi, rtype));
  route_map_counter_increment(PROTO_RM_MAP(zvrf, afi, rtype));
 
- if (PROTO_RM_MAP(zvrf, afi, rtype)) {
-
+ if (PROTO_RM_NAME(zvrf, afi, rtype)) {
  if (IS_ZEBRA_DEBUG_RIB_DETAILED)
  zlog_debug(
  "%u: IPv4 Routemap config for protocol %d scheduling RIB processing",
@@ -332,7 +331,7 @@ static int ip_protocol_rm_del(struct zebra_vrf *zvrf, const char *rmap,
  if (!rmap || strcmp(rmap, PROTO_RM_NAME(zvrf, afi, rtype)) == 0) {
 
  route_map_counter_decrement(PROTO_RM_MAP(zvrf, afi, rtype));
- if (PROTO_RM_MAP(zvrf, afi, rtype)) {
+ if (PROTO_RM_NAME(zvrf, afi, rtype)) {
  if (IS_ZEBRA_DEBUG_RIB_DETAILED)
  zlog_debug(
  "%u: IPv4 Routemap unconfig for protocol %d, scheduling RIB processing",