X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=secnet.git;a=blobdiff_plain;f=tun.c;h=9ef3a9d627c161b96c50290b2985dcf7d307d176;hp=c511dbe23adb2ae510e70f8651fc269e8accbe3a;hb=771a583af1a28d23506e557d1f9c83296b0d1d35;hpb=5540bab74ca1a39639a098d15e87daf45d83b7ec

diff --git a/tun.c b/tun.c
index c511dbe..9ef3a9d 100644
--- a/tun.c
+++ b/tun.c
@@ -116,7 +116,7 @@ static void tun_afterpoll(void *sst, struct pollfd *fds, int nfds)
     if (fds[0].revents&POLLIN) {
 	BUF_ALLOC(st->buff,"tun_afterpoll");
 	buffer_init(st->buff,calculate_max_start_pad());
-	l=read(st->fd,st->buff->start,st->buff->len-calculate_max_start_pad());
+	l=read(st->fd, st->buff->start, buf_remaining_space(st->buff));
 	if (l<0) {
 	    fatal_perror("tun_afterpoll: read()");
 	}
@@ -241,7 +241,7 @@ static bool_t tun_set_route(void *sst, struct netlink_client *routes)
 	    break;
 	}
     }
-    if (st->route_type==TUN_CONFIG_IOCTL) {
+    if (fd >= 0) {
 	close(fd);
     }
     routes->kup=up;
@@ -340,6 +340,8 @@ static void tun_phase_hook(void *sst, uint32_t newphase)
 	st->interface_name=safe_malloc(10,"tun_apply");
 	sprintf(st->interface_name,"tun%d",ppa);
 	st->fd=tun_fd;
+	setcloexec(if_ifd);
+	setcloexec(ip_ifd);
 #else
 	fatal("tun_phase_hook: TUN_FLAVOUR_STREAMS unexpected");
 #endif /* HAVE_TUN_STREAMS */
@@ -350,6 +352,8 @@ static void tun_phase_hook(void *sst, uint32_t newphase)
        to set the TUN device's address, and route to add routes to all
        our networks. */
 
+    setcloexec(st->fd);
+
     hostaddr=ipaddr_to_string(st->nl.local_address);
     secnetaddr=ipaddr_to_string(st->nl.secnet_address);
     snprintf(mtu,sizeof(mtu),"%d",st->nl.mtu);