From: Renato Westphal <renato@opensourcerouting.org>
Date: Fri, 19 Oct 2018 18:55:47 +0000 (-0300)
Subject: ospfd: fix issue with the "no segment-routing prefix A.B.C.D/M" command
X-Git-Tag: frr-7.1-dev~253^2
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=98c06e8618fe7c73edddeaf6ac35186521e4604b;p=matthieu%2Ffrr.git

ospfd: fix issue with the "no segment-routing prefix A.B.C.D/M" command

Add a missing check to bail out earlier when SR is not configured. The
same command without the "no" prefix has the same check as it prevents
unexpected things (i.e. crashes) from happening.

Fixes the following segfaults:
ospfd aborted: vtysh -c "configure terminal" -c "router ospf" -c "no segment-routing prefix 1.1.1.1/32"
ospfd aborted: vtysh -c "configure terminal" -c "router ospf" -c "no segment-routing prefix 1.1.1.1/32 index 65535 no-php-flag"

Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
---

diff --git a/ospfd/ospf_sr.c b/ospfd/ospf_sr.c
index d793735003..3a21b723d5 100644
--- a/ospfd/ospf_sr.c
+++ b/ospfd/ospf_sr.c
@@ -2053,6 +2053,9 @@ DEFUN (no_sr_prefix_sid,
 	bool found = false;
 	int rc;
 
+	if (!ospf_sr_enabled(vty))
+		return CMD_WARNING_CONFIG_FAILED;
+
 	/* Get network prefix */
 	argv_find(argv, argc, "A.B.C.D/M", &idx);
 	rc = str2prefix(argv[idx]->arg, &p);