From: rgirada <rgirada@vmware.com>
Date: Tue, 20 Jul 2021 11:39:05 +0000 (-0700)
Subject: ospfd: ospfd crash while giving 'clear ip ospf neighbor'
X-Git-Tag: base_8.1~305^2
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=refs%2Fpull%2F9093%2Fhead;p=mirror%2Ffrr.git

ospfd: ospfd crash while giving 'clear ip ospf neighbor'

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>
---

diff --git a/ospfd/ospf_vty.c b/ospfd/ospf_vty.c
index 2cb3ec0894..bf2a8564f0 100644
--- a/ospfd/ospf_vty.c
+++ b/ospfd/ospf_vty.c
@@ -11389,6 +11389,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);
 	}