xnu-1228.7.58.tar.gz

[apple/xnu.git] / osfmk / i386 / user_ldt.c

diff --git a/osfmk/i386/user_ldt.c b/osfmk/i386/user_ldt.c
index 57bb34fc9cdee28b5fa5c0f9c88dd7fa7074b378..87aab04269f469fc109f5675cbc8cbfc8459077e 100644 (file)
--- a/osfmk/i386/user_ldt.c
+++ b/osfmk/i386/user_ldt.c
@@ -1,23 +1,29 @@
 /*
 /*

- * Copyright (c) 2000-2004 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2000-2006 Apple Computer, Inc. All rights reserved.

  *
  *

- * @APPLE_LICENSE_HEADER_START@
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@

  * 
  * 

- * The contents of this file constitute Original Code as defined in and
- * are subject to the Apple Public Source License Version 1.1 (the
- * "License").  You may not use this file except in compliance with the
- * License.  Please obtain a copy of the License at
- * http://www.apple.com/publicsource and read it before using this file.
+ * 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. 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.

  * 
  * 

- * This Original Code and all software distributed under the License are
- * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * 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

  * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
  * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
  * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
  * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,

- * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
- * License for the specific language governing rights and limitations
- * under the License.
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.

  * 
  * 

- * @APPLE_LICENSE_HEADER_END@
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@

  */
 /*
  * @OSF_COPYRIGHT@
  */
 /*
  * @OSF_COPYRIGHT@


@@ -82,7 +88,7 @@ static void user_ldt_set_action(void *);
 
 int
 i386_set_ldt(
 
 int
 i386_set_ldt(

-       int                     *retval,
+       uint32_t                *retval,

        uint32_t                start_sel,
        uint32_t                descs,  /* out */
        uint32_t                num_sels)
        uint32_t                start_sel,
        uint32_t                descs,  /* out */
        uint32_t                num_sels)


@@ -100,7 +106,7 @@ i386_set_ldt(
            && (start_sel < min_selector || start_sel >= LDTSZ))
            return EINVAL;
        if (start_sel != LDT_AUTO_ALLOC
            && (start_sel < min_selector || start_sel >= LDTSZ))
            return EINVAL;
        if (start_sel != LDT_AUTO_ALLOC

-           && (uint64_t)start_sel + (uint64_t)num_sels > LDTSZ)
+           && (uint64_t)start_sel + (uint64_t)num_sels > LDTSZ) /* cast to uint64_t to detect wrap-around */

            return EINVAL;
 
        task_lock(task);
            return EINVAL;
 
        task_lock(task);


@@ -276,7 +282,7 @@ i386_set_ldt(
 
 int
 i386_get_ldt(
 
 int
 i386_get_ldt(

-       int                     *retval,
+       uint32_t                *retval,

        uint32_t                start_sel,
        uint32_t                descs,  /* out */
        uint32_t                num_sels)
        uint32_t                start_sel,
        uint32_t                descs,  /* out */
        uint32_t                num_sels)