From: David Lamparter <equinox@opensourcerouting.org>
Date: Tue, 8 May 2012 04:27:04 +0000 (+0200)
Subject: isisd: pull up invalid prefix assert()
X-Git-Tag: frr-2.0-rc1~1768
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=948b6bef7f9cf841a98fe3ea40419696500c8c4c;p=matthieu%2Ffrr.git

isisd: pull up invalid prefix assert()

processing invalid prefixes causes isisd to assert() or otherwise
misbehave in ip_masklen/apply_mask.  pull up the assert() to indicate
better there's broken data in isisd's LSDB.

  * isisd/isis_spf.c: assert() prefix lengths

Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
---

diff --git a/isisd/isis_spf.c b/isisd/isis_spf.c
index 198104a98d..eff7c47617 100644
--- a/isisd/isis_spf.c
+++ b/isisd/isis_spf.c
@@ -813,6 +813,8 @@ lspfragloop:
     for (ALL_LIST_ELEMENTS_RO (lsp->tlv_data.te_ipv4_reachs,
                                node, te_ipv4_reach))
     {
+      assert ((te_ipv4_reach->control & 0x3F) <= IPV4_MAX_BITLEN);
+
       dist = cost + ntohl (te_ipv4_reach->te_metric);
       vtype = VTYPE_IPREACH_TE;
       prefix.u.prefix4 = newprefix2inaddr (&te_ipv4_reach->prefix_start,
@@ -829,6 +831,8 @@ lspfragloop:
     prefix.family = AF_INET6;
     for (ALL_LIST_ELEMENTS_RO (lsp->tlv_data.ipv6_reachs, node, ip6reach))
     {
+      assert (ip6reach->prefix_len <= IPV6_MAX_BITLEN);
+
       dist = cost + ip6reach->metric;
       vtype = (ip6reach->control_info & CTRL_INFO_DISTRIBUTION) ?
         VTYPE_IP6REACH_EXTERNAL : VTYPE_IP6REACH_INTERNAL;