X-Git-Url: https://tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Flinux%2Fdevice.c;h=f770f7fade4d15d732100335cfcd84a83702c777;hp=93d4b414ebf31f16de6ce482ed1127543bc1ccd3;hb=8793fb7d43161f4d5358ff73b7a4937ad7e642e2;hpb=3b1fad04de6bed2f284fdf3d5b27d4162aeebc8c

diff --git a/src/linux/device.c b/src/linux/device.c
index 93d4b414..f770f7fa 100644
--- a/src/linux/device.c
+++ b/src/linux/device.c
@@ -73,6 +73,10 @@ static bool setup_device(void) {
 		return false;
 	}
 
+#ifdef FD_CLOEXEC
+	fcntl(device_fd, F_SETFD, FD_CLOEXEC);
+#endif
+
 #ifdef HAVE_LINUX_IF_TUN_H
 	/* Ok now check if this is an old ethertap or a new tun/tap thingie */
 
@@ -151,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:
@@ -206,7 +211,7 @@ static bool write_packet(vpn_packet_t *packet) {
 			}
 			break;
 		case DEVICE_TYPE_ETHERTAP:
-			*(short int *)(packet->data - 2) = packet->len;
+			memcpy(packet->data - 2, &packet->len, 2);
 
 			if(write(device_fd, packet->data - 2, packet->len + 2) < 0) {
 				logger(LOG_ERR, "Can't write to %s %s: %s", device_info, device,