From: paul <paul>
Date: Thu, 3 Apr 2003 01:27:01 +0000 (+0000)
Subject: From: David Watson <dwatson@eecs.umich.edu>
X-Git-Tag: frr-2.0-rc1~4116
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=d18258304a79b459fe768e63f27efd17aa1fa78f;p=matthieu%2Ffrr.git

From: David Watson <dwatson@eecs.umich.edu>
Subject: [zebra 18573] PATCH ospfd: byte order error in assert statement

 I found a bug in the ospfd code tickled this morning by a Type 1
 LSA with exactly 62 entries (LSA length of 768, or 0x0300).
 A missing ntohs in ospf_lsa.c:ospf_lsa_different() causes an assert
 statement to fail, stopping ospfd.
 >   assert (l1->data->length > OSPF_LSA_HEADER_SIZE);
 So, a length of type 768 turns into a length of 3 which is
 obviously less than 20.
 David
---

diff --git a/ospfd/ospf_lsa.c b/ospfd/ospf_lsa.c
index e01dbd0d02..45b554fb05 100644
--- a/ospfd/ospf_lsa.c
+++ b/ospfd/ospf_lsa.c
@@ -2839,7 +2839,7 @@ ospf_lsa_different (struct ospf_lsa *l1, struct ospf_lsa *l2)
   if (l1->data->length ==  0)
     return 1;
 
-  assert (l1->data->length > OSPF_LSA_HEADER_SIZE);
+  assert ( ntohs(l1->data->length) > OSPF_LSA_HEADER_SIZE);
 
   p1 = (char *) l1->data;
   p2 = (char *) l2->data;