ospf6d: fix backlink check

This code has been wrong ~ever (according to git history). There are 3
conditional blocks with the added assertion that both the LSA and the
vertex being checked can't both be network LSAs.

The third block is clearly assuming both LSA and vertex are router
LSAs b/c it is accessing the backlink and lsdesc as router lsdesc's also
making sure both are p2p links (which they would have to be to point at
each other).

The programming error here is that (A && B) == False does NOT imply !A,
but the code is written that way.

So we end up in the third block one of LSA or vertex being network LSAs
rather easily (whenever that is the case and the desc isn't the backlink
being sought).

This was caught by ASAN b/c the lsdesc and backlinks are being accessed
(> 4 byte field offsets) as if they were router lsdesc's in the third
block, when in fact one of them is a network lsdesc which is only 4
bytes long -- so ASAN flags the access beyond bounds.

Signed-off-by: Christian Hopps <chopps@labn.net>
(cherry picked from commit ff2052eefc7d99604c4480398c86163f2255ff73)

diff --git a/ospf6d/ospf6_spf.c b/ospf6d/ospf6_spf.c
index 7652d71c59d52ed52e7050dca9bc14a674cf254f..803fc4c640cbc4b23e3840bff2de5155c21c1cb9 100644 (file)
--- a/ospf6d/ospf6_spf.c
+++ b/ospf6d/ospf6_spf.c
@@ -223,21 +223,25 @@ static char *ospf6_lsdesc_backlink(struct ospf6_lsa *lsa, caddr_t lsdesc,
                assert(!(OSPF6_LSA_IS_TYPE(NETWORK, lsa)
                         && VERTEX_IS_TYPE(NETWORK, v)));
 
-               if (OSPF6_LSA_IS_TYPE(NETWORK, lsa)
-                   && NETWORK_LSDESC_GET_NBR_ROUTERID(backlink)
-                              == v->lsa->header->adv_router)
-                       found = backlink;
-               else if (VERTEX_IS_TYPE(NETWORK, v)
-                        && ROUTER_LSDESC_IS_TYPE(TRANSIT_NETWORK, backlink)
-                        && ROUTER_LSDESC_GET_NBR_ROUTERID(backlink)
-                                   == v->lsa->header->adv_router
-                        && ROUTER_LSDESC_GET_NBR_IFID(backlink)
-                                   == ntohl(v->lsa->header->id))
-                       found = backlink;
-               else {
+               if (OSPF6_LSA_IS_TYPE(NETWORK, lsa)) {
+                       if (NETWORK_LSDESC_GET_NBR_ROUTERID(backlink)
+                           == v->lsa->header->adv_router)
+                               found = backlink;
+               } else if (VERTEX_IS_TYPE(NETWORK, v)) {
+                       if (ROUTER_LSDESC_IS_TYPE(TRANSIT_NETWORK, backlink)
+                           && ROUTER_LSDESC_GET_NBR_ROUTERID(backlink)
+                                      == v->lsa->header->adv_router
+                           && ROUTER_LSDESC_GET_NBR_IFID(backlink)
+                                      == ntohl(v->lsa->header->id))
+                               found = backlink;
+               } else {
+                       assert(OSPF6_LSA_IS_TYPE(ROUTER, lsa)
+                              && VERTEX_IS_TYPE(ROUTER, v));
+
                        if (!ROUTER_LSDESC_IS_TYPE(POINTTOPOINT, backlink)
                            || !ROUTER_LSDESC_IS_TYPE(POINTTOPOINT, lsdesc))
                                continue;
+
                        if (ROUTER_LSDESC_GET_NBR_IFID(backlink)
                                    != ROUTER_LSDESC_GET_IFID(lsdesc)
                            || ROUTER_LSDESC_GET_NBR_IFID(lsdesc)