xnu-792.21.3.tar.gz

[apple/xnu.git] / bsd / kern / mach_fat.c

diff --git a/bsd/kern/mach_fat.c b/bsd/kern/mach_fat.c
index deae7df513515a34dc36b2ed46a19bda4006e00f..a9418aa8f981bf6e8b63351c6bf0e2a341deea57 100644 (file)
--- a/bsd/kern/mach_fat.c
+++ b/bsd/kern/mach_fat.c
@@ -1,14 +1,19 @@
 /*
  * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
  *
- * @APPLE_LICENSE_HEADER_START@
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
  * 
  * This file contains Original Code and/or Modifications of Original Code
  * as defined in and that are subject to the Apple Public Source License
  * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
+ * 
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
  * 
  * The Original Code and all software distributed under the License are
  * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
@@ -18,7 +23,7 @@
  * Please see the License for the specific language governing rights and
  * limitations under the License.
  * 
- * @APPLE_LICENSE_HEADER_END@
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
  */
 /* Copyright (c) 1991 NeXT Computer, Inc.  All rights reserved.
  *
@@ -85,7 +90,7 @@ fatfile_getarch2(
        int                     grade;
        int                     best_grade;
        int                     nfat_arch;
-       int                     end_of_archs;
+       off_t           end_of_archs;
        struct fat_header       *header;
 #if 0
        off_t filesize;
@@ -103,8 +108,8 @@ fatfile_getarch2(
         */
        nfat_arch = NXSwapBigLongToHost(header->nfat_arch);
 
-       end_of_archs = sizeof(struct fat_header)
-               + nfat_arch * sizeof(struct fat_arch);
+       end_of_archs = (off_t)nfat_arch * sizeof(struct fat_arch) + 
+               sizeof(struct fat_header);
 #if 0
        filesize = ubc_getsize(vp);
        if (end_of_archs > (int)filesize) {
@@ -112,9 +117,12 @@ fatfile_getarch2(
        }
 #endif
 
-       /* This is beacuse we are reading only 512 bytes */
-
-       if (end_of_archs > 512)
+       /*
+        * This check is limited on the top end because we are reading
+        * only PAGE_SIZE bytes
+        */
+       if (end_of_archs > PAGE_SIZE ||
+               end_of_archs < (sizeof(struct fat_header)+sizeof(struct fat_arch)))
                return(LOAD_BADMACHO);
        /*
         *      Round size of fat_arch structures up to page boundry.