protocols: don't use assert on paths that can be reached

Malformed packets should not make lldpd crash. Ensure we can handle them
by not using assert() in this part.

diff --git a/src/daemon/lldpd.c b/src/daemon/lldpd.c
index 876fcc9057cc44e256ab43ec6dd444caa2fbf149..b4716f45d47250b4658b95c555d11b388ba3935c 100644 (file)
--- a/src/daemon/lldpd.c
+++ b/src/daemon/lldpd.c
@@ -198,7 +198,6 @@ lldpd_alloc_mgmt(int family, void *addrptr, size_t addrsize, u_int32_t iface)
                return NULL;
        }
        mgmt->m_family = family;
-       assert(addrsize <= LLDPD_MGMT_MAXADDRSIZE);
        memcpy(&mgmt->m_addr, addrptr, addrsize);
        mgmt->m_addrsize = addrsize;
        mgmt->m_iface = iface;

diff --git a/src/daemon/protocols/cdp.c b/src/daemon/protocols/cdp.c
index 5dfa20eaf6718e63becdf486f34510cb7005d33c..09a8d2b3ba20a593ad81a42e68c5a9ce26863996 100644 (file)
--- a/src/daemon/protocols/cdp.c
+++ b/src/daemon/protocols/cdp.c
@@ -25,7 +25,6 @@
 #include <unistd.h>
 #include <errno.h>
 #include <arpa/inet.h>
-#include <assert.h>
 
 static int
 cdp_send(struct lldpd *global,
@@ -438,8 +437,13 @@ cdp_decode(struct lldpd *cfg, char *frame, int s,
                                                mgmt = lldpd_alloc_mgmt(LLDPD_AF_IPV4, &addr, 
                                                                        sizeof(struct in_addr), 0);
                                                if (mgmt == NULL) {
-                                                       assert(errno == ENOMEM);
-                                                       log_warn("cdp", "unable to allocate memory for management address");
+                                                       if (errno == ENOMEM)
+                                                               log_warn("cdp",
+                                                                   "unable to allocate memory for management address");
+                                                       else
+                                                               log_warn("cdp",
+                                                                   "too large management address received on %s",
+                                                                   hardware->h_ifname);
                                                        goto malformed;
                                                }
                                                TAILQ_INSERT_TAIL(&chassis->c_mgmt, mgmt, m_entries);

diff --git a/src/daemon/protocols/edp.c b/src/daemon/protocols/edp.c
index acbe53dd56ed0e8cb8f4b84303bce26a9a177273..9b9fc203e22bc90f63454c13c372763d2bf40674 100644 (file)
--- a/src/daemon/protocols/edp.c
+++ b/src/daemon/protocols/edp.c
@@ -25,7 +25,6 @@
 #include <errno.h>
 #include <arpa/inet.h>
 #include <fnmatch.h>
-#include <assert.h>
 
 static int seq = 0;
 

diff --git a/src/daemon/protocols/lldp.c b/src/daemon/protocols/lldp.c
index 431b22fd76dbf1fbb972e3d5ed9b50e717ad8d76..deddc3e757414224ab01f76b5024ba24e49fa5b2 100644 (file)
--- a/src/daemon/protocols/lldp.c
+++ b/src/daemon/protocols/lldp.c
@@ -20,7 +20,6 @@
 
 #include <unistd.h>
 #include <errno.h>
-#include <assert.h>
 #include <time.h>
 #include <sys/types.h>
 #include <sys/socket.h>
@@ -161,7 +160,7 @@ static int _lldp_send(struct lldpd *global,
        /* Management addresses */
        TAILQ_FOREACH(mgmt, &chassis->c_mgmt, m_entries) {
                proto = lldpd_af_to_lldp_proto(mgmt->m_family);
-               assert(proto != LLDP_MGMT_ADDR_NONE);
+               if (proto == LLDP_MGMT_ADDR_NONE) continue;
                if (!(
                          POKE_START_LLDP_TLV(LLDP_TLV_MGMT_ADDR) &&
                          /* Size of the address, including its type */
@@ -749,10 +748,13 @@ lldp_decode(struct lldpd *cfg, char *frame, int s,
                                iface = 0;
                        mgmt = lldpd_alloc_mgmt(af, addr_ptr, addr_length, iface);
                        if (mgmt == NULL) {
-                               assert(errno == ENOMEM);
-                               log_warn("lldp", "unable to allocate memory "
-                                                       "for management address");
-                                               goto malformed;
+                               if (errno == ENOMEM)
+                                       log_warn("lldp", "unable to allocate memory "
+                                           "for management address");
+                               else
+                                       log_warn("lldp", "too large management address "
+                                           "received on %s", hardware->h_ifname);
+                               goto malformed;
                        }
                        TAILQ_INSERT_TAIL(&chassis->c_mgmt, mgmt, m_entries);
                        break;

diff --git a/src/daemon/protocols/sonmp.c b/src/daemon/protocols/sonmp.c
index 30930cb340934dae8e3022f40d947b60ecae0747..b55d73b7a59b078eb759a44ce507a6f70a0c62ca 100644 (file)
--- a/src/daemon/protocols/sonmp.c
+++ b/src/daemon/protocols/sonmp.c
@@ -24,7 +24,6 @@
 #include <unistd.h>
 #include <errno.h>
 #include <arpa/inet.h>
-#include <assert.h>
 
 static struct sonmp_chassis sonmp_chassis_types[] = {
        {1, "unknown (via SONMP)"},
@@ -358,8 +357,11 @@ sonmp_decode(struct lldpd *cfg, char *frame, int s,
        }
        mgmt = lldpd_alloc_mgmt(LLDPD_AF_IPV4, &address, sizeof(struct in_addr), 0);
        if (mgmt == NULL) {
-               assert(errno == ENOMEM);
-               log_warn("sonmp", "unable to allocate memory for management address");
+               if (errno == ENOMEM)
+                       log_warn("sonmp", "unable to allocate memory for management address");
+               else
+                       log_warn("sonmp", "too large management address received on %s",
+                           hardware->h_ifname);
                goto malformed;
        }
        TAILQ_INSERT_TAIL(&chassis->c_mgmt, mgmt, m_entries);