ospfd,eigrpd: don't take address of packed struct member

Use a local variable to avoid trying to take the address
of a packed struct member - an address from the ip header
in these cases.

Signed-off-by: Mark Stapp <mjs@voltanet.io>

diff --git a/eigrpd/eigrp_packet.c b/eigrpd/eigrp_packet.c
index ba8271d46e17e92ebefbde9e0ff9a6376dab749f..6367ef58ab5645bda0d027a2a8ee56f0873dc226 100644 (file)
--- a/eigrpd/eigrp_packet.c
+++ b/eigrpd/eigrp_packet.c
@@ -485,7 +485,7 @@ int eigrp_read(struct thread *thread)
        struct eigrp_header *eigrph;
        struct interface *ifp;
        struct eigrp_neighbor *nbr;
-
+       struct in_addr srcaddr;
        uint16_t opcode = 0;
        uint16_t length = 0;
 
@@ -511,6 +511,7 @@ int eigrp_read(struct thread *thread)
        if (iph->ip_v == 4)
                length = (iph->ip_len) - 20U;
 
+       srcaddr = iph->ip_src;
 
        /* IP Header dump. */
        if (IS_DEBUG_EIGRP_TRANSMIT(0, RECV)
@@ -526,7 +527,7 @@ int eigrp_read(struct thread *thread)
                   and also platforms (such as Solaris 8) that claim to support
                   ifindex
                   retrieval but do not. */
-               c = if_lookup_address((void *)&iph->ip_src, AF_INET,
+               c = if_lookup_address((void *)&srcaddr, AF_INET,
                                      eigrp->vrf_id);
 
                if (c == NULL)
@@ -549,11 +550,11 @@ int eigrp_read(struct thread *thread)
 
        /* Self-originated packet should be discarded silently. */
        if (eigrp_if_lookup_by_local_addr(eigrp, NULL, iph->ip_src)
-           || (IPV4_ADDR_SAME(&iph->ip_src, &ei->address.u.prefix4))) {
+           || (IPV4_ADDR_SAME(&srcaddr, &ei->address.u.prefix4))) {
                if (IS_DEBUG_EIGRP_TRANSMIT(0, RECV))
                        zlog_debug(
                                "eigrp_read[%s]: Dropping self-originated packet",
-                               inet_ntoa(iph->ip_src));
+                               inet_ntoa(srcaddr));
                return 0;
        }
 

diff --git a/ospfd/ospf_neighbor.c b/ospfd/ospf_neighbor.c
index a58bd93b6e8fbc0f5e167139ab8edf94f99b82c7..a9247dd0ec0ed02fda1c93607fa45192dc7e3cc4 100644 (file)
--- a/ospfd/ospf_neighbor.c
+++ b/ospfd/ospf_neighbor.c
@@ -402,12 +402,14 @@ void ospf_renegotiate_optional_capabilities(struct ospf *top)
 struct ospf_neighbor *ospf_nbr_lookup(struct ospf_interface *oi, struct ip *iph,
                                      struct ospf_header *ospfh)
 {
+       struct in_addr srcaddr = iph->ip_src;
+
        if (oi->type == OSPF_IFTYPE_VIRTUALLINK
            || oi->type == OSPF_IFTYPE_POINTOPOINT)
                return (ospf_nbr_lookup_by_routerid(oi->nbrs,
                                                    &ospfh->router_id));
        else
-               return (ospf_nbr_lookup_by_addr(oi->nbrs, &iph->ip_src));
+               return (ospf_nbr_lookup_by_addr(oi->nbrs, &srcaddr));
 }
 
 static struct ospf_neighbor *ospf_nbr_add(struct ospf_interface *oi,