]> git.puffer.fish Git - matthieu/frr.git/commitdiff
ospfd: ospfd crash while giving 'clear ip ospf neighbor'
authorrgirada <rgirada@vmware.com>
Tue, 20 Jul 2021 11:39:05 +0000 (04:39 -0700)
committermergify-bot <noreply@mergify.io>
Fri, 23 Jul 2021 09:29:37 +0000 (09:29 +0000)
Description:
Ospf process crashes upon giving 'clear ip ospf neighbor' with
        self routerId. It is asserting if it is a self neighbor in ospf
        neighbour kill event processing.
Added a check to validate the provided router-id is self
        router-id.

Signed-off-by: Rajesh Girada <rgirada@vmware.com>
(cherry picked from commit c88ad8ec5b309132b6319fd5677e427d5d8ac12c)

ospfd/ospf_vty.c

index 54ce248d89efe5225ffc0ffb9ac7b37bcec52922..a3e7e49d3d68c64c27f8473db70757944a654f75 100644 (file)
@@ -11383,6 +11383,11 @@ DEFPY (clear_ip_ospf_neighbor,
                if (!ospf->oi_running)
                        continue;
 
+               if (nbr_id_str && IPV4_ADDR_SAME(&ospf->router_id, &nbr_id)) {
+                       vty_out(vty, "Self router-id is not allowed.\r\n ");
+                       return CMD_SUCCESS;
+               }
+
                ospf_neighbor_reset(ospf, nbr_id, nbr_id_str);
        }