xnu-124.8

Imported from https://opensource.apple.com/tarballs/xnu/xnu-124.8.tar.gz
whutdyp · Jun 4, 2017 · 095f58f · 095f58f
1 parent 587f919
commit 095f58f
Show file tree

Hide file tree

Showing 10 changed files with 25 additions and 25 deletions.
diff --git a/bsd/conf/version.variant b/bsd/conf/version.variant
@@ -1 +1 @@
-2
+3
diff --git a/bsd/hfs/hfs_vnodeops.c b/bsd/hfs/hfs_vnodeops.c
@@ -3227,7 +3227,7 @@ struct vop_readdir_args /* {
 			goto Exit;
 	}
 
-	diroffset = uio->uio_offset - sizeof(rootdots);
+	diroffset = uio->uio_offset;
 
 	/* lock catalog b-tree */
 	retval = hfs_metafilelocking(VTOHFS(ap->a_vp), kHFSCatalogFileID, LK_SHARED, p);

diff --git a/bsd/hfs/hfscommon/Catalog/Catalog.c b/bsd/hfs/hfscommon/Catalog/Catalog.c
@@ -816,7 +816,7 @@ GetDirEntrySize(BTreeIterator *bip, ExtendedVCB * vol)
 OSErr
 PositionIterator(CatalogIterator *cip, UInt32 offset, BTreeIterator *bip, UInt16 *op)
 {
-#define CAT_START_OFFSET 0
+#define CAT_START_OFFSET (2 * sizeof(struct hfsdotentry))
 	ExtendedVCB *	vol;
 	FCB *		fcb;
 	OSErr		result = 0;
@@ -877,7 +877,7 @@ PositionIterator(CatalogIterator *cip, UInt32 offset, BTreeIterator *bip, UInt16
 			pid = *idp;
 
 			curOffset = CAT_START_OFFSET;
-	 		nextOffset = GetDirEntrySize(bip, vol);
+	 		nextOffset = CAT_START_OFFSET + GetDirEntrySize(bip, vol);
 
 			while (nextOffset < offset) {
 				result = BTIterateRecord( fcb, kBTreeNextRecord, bip, NULL, NULL );		

diff --git a/iokit/KernelConfigTables.cpp b/iokit/KernelConfigTables.cpp
@@ -28,21 +28,21 @@
  */
 const char * gIOKernelKmods =
 "{
-    'com.apple.kernel'                         = '1.3.2';
-    'com.apple.kernel.bsd'                     = '1.0.2';
-    'com.apple.kernel.iokit'                   = '1.0.2';
-    'com.apple.kernel.libkern'                 = '1.0.2';
-    'com.apple.kernel.mach'                    = '1.0.2';
-    'com.apple.iokit.IOADBFamily'              = '1.0.2';
-    'com.apple.iokit.IOCDStorageFamily'        = '1.0.2';
-    'com.apple.iokit.IODVDStorageFamily'       = '1.0.2';
-    'com.apple.iokit.IOGraphicsFamily'         = '1.0.2';
-    'com.apple.iokit.IOHIDSystem'              = '1.0.2';
-    'com.apple.iokit.IONDRVSupport'            = '1.0.2';
-    'com.apple.iokit.IONetworkingFamily'       = '1.0.2';
-    'com.apple.iokit.IOPCIFamily'              = '1.0.2';
-    'com.apple.iokit.IOStorageFamily'          = '1.0.2';
-    'com.apple.iokit.IOSystemManagementFamily' = '1.0.2';
+    'com.apple.kernel'                         = '1.3.3';
+    'com.apple.kernel.bsd'                     = '1.0.3';
+    'com.apple.kernel.iokit'                   = '1.0.3';
+    'com.apple.kernel.libkern'                 = '1.0.3';
+    'com.apple.kernel.mach'                    = '1.0.3';
+    'com.apple.iokit.IOADBFamily'              = '1.0.3';
+    'com.apple.iokit.IOCDStorageFamily'        = '1.0.3';
+    'com.apple.iokit.IODVDStorageFamily'       = '1.0.3';
+    'com.apple.iokit.IOGraphicsFamily'         = '1.0.3';
+    'com.apple.iokit.IOHIDSystem'              = '1.0.3';
+    'com.apple.iokit.IONDRVSupport'            = '1.0.3';
+    'com.apple.iokit.IONetworkingFamily'       = '1.0.3';
+    'com.apple.iokit.IOPCIFamily'              = '1.0.3';
+    'com.apple.iokit.IOStorageFamily'          = '1.0.3';
+    'com.apple.iokit.IOSystemManagementFamily' = '1.0.3';
 }";
 
 

diff --git a/iokit/conf/version.variant b/iokit/conf/version.variant
@@ -1 +1 @@
-2
+3
diff --git a/libkern/conf/version.variant b/libkern/conf/version.variant
@@ -1 +1 @@
-2
+3
diff --git a/libsa/conf/version.variant b/libsa/conf/version.variant
@@ -1 +1 @@
-2
+3
diff --git a/osfmk/conf/kernelversion.variant b/osfmk/conf/kernelversion.variant
@@ -1 +1 @@
-2
+3
diff --git a/osfmk/conf/version.variant b/osfmk/conf/version.variant
@@ -1 +1 @@
-2
+3
diff --git a/pexpert/conf/version.variant b/pexpert/conf/version.variant
@@ -1 +1 @@
-2
+3