Clear Ethernet header when reading packets from a tun device.

This fixes a warning from valgrind about uninitialized bytes, which were being
sent to other nodes.

diff --git a/src/bsd/device.c b/src/bsd/device.c
index d6dd055428491f815e75fb5fa403b3ea8f59cf56..c91eb5e2079dc7867c971d0a6cd16d9bdc720118 100644 (file)
--- a/src/bsd/device.c
+++ b/src/bsd/device.c
@@ -238,6 +238,7 @@ static bool read_packet(vpn_packet_t *packet) {
                                        return false;
                        }
 
+                       memset(packet->data, 0, 12);
                        packet->len = lenin + 14;
                        break;
 
@@ -269,6 +270,7 @@ static bool read_packet(vpn_packet_t *packet) {
                                        return false;
                        }
 
+                       memset(packet->data, 0, 12);
                        packet->len = lenin + 10;
                        break;
                }

diff --git a/src/linux/device.c b/src/linux/device.c
index 5ae89478c44254e36ca25c05e147259ad108c6db..f770f7fade4d15d732100335cfcd84a83702c777 100644 (file)
--- a/src/linux/device.c
+++ b/src/linux/device.c
@@ -155,6 +155,7 @@ static bool read_packet(vpn_packet_t *packet) {
                                return false;
                        }
 
+                       memset(packet->data, 0, 12);
                        packet->len = lenin + 10;
                        break;
                case DEVICE_TYPE_TAP:

diff --git a/src/solaris/device.c b/src/solaris/device.c
index 969b514ae39fa36c917fa92ea004bafd9d70667c..26121e27350b9e5974f6b8982f58a3753eca8be9 100644 (file)
--- a/src/solaris/device.c
+++ b/src/solaris/device.c
@@ -151,6 +151,7 @@ static bool read_packet(vpn_packet_t *packet) {
                        return false;
        }
 
+       memset(packet->data, 0, 12);
        packet->len = lenin + 14;
 
        device_total_in += packet->len;