tuntap: fix reading too much (useless) data.

In cases when we read more data from the tuntap device than we can handle we just truncate the packet for now.
zehome · Dec 13, 2016 · bc34fb8 · bc34fb8
1 parent 4ae10b5
commit bc34fb8
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/src/tuntap_bsd.c b/src/tuntap_bsd.c
@@ -25,7 +25,7 @@ mlvpn_tuntap_read(struct tuntap_s *tuntap)
     iov[0].iov_base = &type;
     iov[0].iov_len = sizeof(type);
     iov[1].iov_base = &data;
-    iov[1].iov_len = DEFAULT_MTU;
+    iov[1].iov_len = tuntap->maxmtu;
     ret = readv(tuntap->fd, iov, 2);
     if (ret < 0) {
         if (errno != EAGAIN && errno != EWOULDBLOCK) {

diff --git a/src/tuntap_darwin.c b/src/tuntap_darwin.c
@@ -14,7 +14,7 @@ mlvpn_tuntap_read(struct tuntap_s *tuntap)
 {
     ssize_t ret;
     u_char data[DEFAULT_MTU];
-    ret = read(tuntap->fd, &data, DEFAULT_MTU);
+    ret = read(tuntap->fd, &data, tuntap->maxmtu);
     if (ret < 0) {
         if (errno != EAGAIN && errno != EWOULDBLOCK) {
             /* read error on tuntap is not recoverable. We must die. */

diff --git a/src/tuntap_linux.c b/src/tuntap_linux.c
@@ -16,7 +16,7 @@ mlvpn_tuntap_read(struct tuntap_s *tuntap)
 {
     ssize_t ret;
     u_char data[DEFAULT_MTU];
-    ret = read(tuntap->fd, &data, DEFAULT_MTU);
+    ret = read(tuntap->fd, &data, tuntap->maxmtu);
     if (ret < 0) {
         if (errno != EAGAIN && errno != EWOULDBLOCK) {
             /* read error on tuntap is not recoverable. We must die. */