xnu-344.2

Imported from https://opensource.apple.com/tarballs/xnu/xnu-344.2.tar.gz
krystalName · Jun 4, 2017 · 5bc19c0 · 5bc19c0
1 parent d738f90
commit 5bc19c0
Show file tree

Hide file tree

Showing 12 changed files with 125 additions and 91 deletions.
diff --git a/bsd/conf/version.minor b/bsd/conf/version.minor
@@ -1 +1 @@
-0
+1
diff --git a/bsd/netinet/tcp_input.c b/bsd/netinet/tcp_input.c
@@ -1046,7 +1046,7 @@ tcp_input(m, off0)
 					tp->snd_nxt = tp->snd_max;
 					tp->t_badrxtwin = 0;
 				}
-				if ((to.to_flag & TOF_TS) != 0)
+				if (((to.to_flag & TOF_TS) != 0) && (to.to_tsecr != 0)) /* Makes sure we already have a TS */
 					tcp_xmit_timer(tp,
 					    tcp_now - to.to_tsecr + 1);
 				else if (tp->t_rtttime &&
@@ -2060,8 +2060,9 @@ tcp_input(m, off0)
 		 * Since we now have an rtt measurement, cancel the
 		 * timer backoff (cf., Phil Karn's retransmit alg.).
 		 * Recompute the initial retransmit timer.
+		 * Also makes sure we have a valid time stamp in hand
 		 */
-		if (to.to_flag & TOF_TS)
+		if (((to.to_flag & TOF_TS) != 0) && (to.to_tsecr != 0))
 			tcp_xmit_timer(tp, tcp_now - to.to_tsecr + 1);
 		else if (tp->t_rtttime && SEQ_GT(th->th_ack, tp->t_rtseq))
 			tcp_xmit_timer(tp, tp->t_rtttime);

diff --git a/bsd/netinet6/esp_input.c b/bsd/netinet6/esp_input.c
@@ -214,6 +214,10 @@ esp4_input(m, off)
 	if (!sumalgo)
 		goto noreplaycheck;
 	siz = (((*sumalgo->sumsiz)(sav) + 3) & ~(4 - 1));
+	if (m->m_pkthdr.len < off + ESPMAXLEN + siz) {
+		ipsecstat.in_inval++;
+		goto bad;
+	}
 	if (AH_MAXSUMSIZE < siz) {
 		ipseclog((LOG_DEBUG,
 		    "internal error: AH_MAXSUMSIZE must be larger than %lu\n",
@@ -581,6 +585,10 @@ esp6_input(mp, offp, proto)
 	if (!sumalgo)
 		goto noreplaycheck;
 	siz = (((*sumalgo->sumsiz)(sav) + 3) & ~(4 - 1));
+	if (m->m_pkthdr.len < off + ESPMAXLEN + siz) {
+		ipsecstat.in_inval++;
+		goto bad;
+	}
 	if (AH_MAXSUMSIZE < siz) {
 		ipseclog((LOG_DEBUG,
 		    "internal error: AH_MAXSUMSIZE must be larger than %lu\n",

diff --git a/bsd/vfs/vfs_cluster.c b/bsd/vfs/vfs_cluster.c
@@ -94,7 +94,7 @@ static int cluster_nocopy_write(struct vnode *vp, struct uio *uio,
 		off_t newEOF, int devblocksize, int flags);
 static int cluster_phys_read(struct vnode *vp, struct uio *uio,
 		off_t filesize);
-static int cluster_phys_write(struct vnode *vp, struct uio *uio);
+static int cluster_phys_write(struct vnode *vp, struct uio *uio, off_t newEOF);
 static int cluster_push_x(struct vnode *vp, off_t EOF, daddr_t first, daddr_t last, int can_delay);
 static int cluster_try_push(struct vnode *vp, off_t newEOF, int can_delay, int push_all);
 
@@ -1090,7 +1090,7 @@ cluster_write(vp, uio, oldEOF, newEOF, headOff, tailOff, devblocksize, flags)
 		        return(retval);
 		  }
 
-		retval = cluster_phys_write(vp, uio);
+		retval = cluster_phys_write(vp, uio, newEOF);
 
 		if (uio->uio_resid == 0 && (flags & IO_TAILZEROFILL))
 		  {
@@ -1206,6 +1206,7 @@ cluster_nocopy_write(vp, uio, newEOF, devblocksize, flags)
 	 *  -- the resid is a page multiple
 	 *  -- the resid will not exceed iov_len
 	 */
+	cluster_try_push(vp, newEOF, 0, 1);
 
 	iov = uio->uio_iov;
 
@@ -1361,9 +1362,10 @@ cluster_nocopy_write(vp, uio, newEOF, devblocksize, flags)
 }
 
 static int
-cluster_phys_write(vp, uio)
+cluster_phys_write(vp, uio, newEOF)
 	struct vnode *vp;
 	struct uio   *uio;
+	off_t        newEOF;
 {
  	upl_t            upl;
 	vm_offset_t      upl_offset;
@@ -1381,6 +1383,7 @@ cluster_phys_write(vp, uio)
 	 *  -- the resid will not exceed iov_len
 	 *  -- the vector target address is physcially contiguous
 	 */
+	cluster_try_push(vp, newEOF, 0, 1);
 
 	iov = uio->uio_iov;
 	io_size = iov->iov_len;
@@ -1907,7 +1910,7 @@ cluster_write_x(vp, uio, oldEOF, newEOF, headOff, tailOff, devblocksize, flags)
 			else
 			        can_delay = 1;
 
-			if (cluster_try_push(vp, newEOF, can_delay, 0) == 0) {
+			if (cluster_try_push(vp, newEOF, 0, 0) == 0) {
 			        vp->v_flag |= VHASDIRTY;
 				goto delay_io;
 			}

diff --git a/iokit/KernelConfigTables.cpp b/iokit/KernelConfigTables.cpp
@@ -28,11 +28,11 @@
  */
 const char * gIOKernelKmods =
 "{
-    'com.apple.kernel'                         = '6.0';
-    'com.apple.kernel.bsd'                     = '6.0';
-    'com.apple.kernel.iokit'                   = '6.0';
-    'com.apple.kernel.libkern'                 = '6.0';
-    'com.apple.kernel.mach'                    = '6.0';
+    'com.apple.kernel'                         = '6.1';
+    'com.apple.kernel.bsd'                     = '6.1';
+    'com.apple.kernel.iokit'                   = '6.1';
+    'com.apple.kernel.libkern'                 = '6.1';
+    'com.apple.kernel.mach'                    = '6.1';
     'com.apple.iokit.IOADBFamily'              = '1.1';
     'com.apple.iokit.IONVRAMFamily'            = '1.1';
     'com.apple.iokit.IOSystemManagementFamily' = '1.1';

diff --git a/iokit/conf/version.minor b/iokit/conf/version.minor
@@ -1 +1 @@
-0
+1
diff --git a/libkern/conf/version.minor b/libkern/conf/version.minor
@@ -1 +1 @@
-0
+1
diff --git a/libsa/conf/version.minor b/libsa/conf/version.minor
@@ -1 +1 @@
-0
+1
diff --git a/osfmk/conf/kernelversion.minor b/osfmk/conf/kernelversion.minor
@@ -1 +1 @@
-0
+1
diff --git a/osfmk/conf/version.minor b/osfmk/conf/version.minor
@@ -1 +1 @@
-0
+1