* isys/nl.c: Skip Netlink messages with void ARP headers or zero-length

        ARP headers.

2 files changed, 12 insertions, 0 deletions

diff --git a/ChangeLog b/ChangeLog
index 33c97de60..781063507 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-05-24  David Cantrell  <dcantrell@redhat.com>
+
+	* isys/nl.c: Skip Netlink messages with void ARP headers or zero-length
+	ARP headers.
+
 2006-05-24  Jeremy Katz  <katzj@redhat.com>
 
 	* scripts/upd-instroot (PACKAGESGR): Add new pygobject package
diff --git a/isys/nl.c b/isys/nl.c
index 00ced2cef..a1de1f291 100644
--- a/isys/nl.c
+++ b/isys/nl.c
@@ -24,6 +24,7 @@
 #include <linux/netlink.h>
 #include <linux/rtnetlink.h>
 #include <arpa/inet.h>
+#include <net/if_arp.h>
 
 #include <glib.h>
 
@@ -283,6 +284,12 @@ int netlink_init_interfaces_list(void) {
       rta = IFLA_RTA(ifi);
       len = IFLA_PAYLOAD(nlh);
 
+      /* void and none are bad */
+      if (ifi->ifi_type == ARPHRD_VOID || ifi->ifi_type == ARPHRD_NONE) {
+         nlh = NLMSG_NEXT(nlh, ret);
+         continue;
+      }
+
       while (RTA_OK(rta, len)) {
          if (rta->rta_type <= len)
             tb[rta->rta_type] = rta;