xnu-1486.2.11.tar.gz

[apple/xnu.git] / osfmk / kern / ledger.c

diff --git a/osfmk/kern/ledger.c b/osfmk/kern/ledger.c
index dbca9b48fdac21b48cf92f7a1fc1f7240e72d38a..c97771d04a3a0288e2f9b8329651c5dbfce499b9 100644 (file)
--- a/osfmk/kern/ledger.c
+++ b/osfmk/kern/ledger.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,
- * 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@
@@ -59,6 +65,9 @@ ledger_enter(
             ledger_t           ledger,
             ledger_item_t      amount)
 {
+       if (ledger == LEDGER_NULL)
+               return KERN_SUCCESS;
+
        /* Need to lock the ledger */
        ledger_lock(ledger);
        
@@ -66,7 +75,7 @@ ledger_enter(
                if (ledger->ledger_limit != LEDGER_ITEM_INFINITY &&
                    ledger->ledger_balance + amount > ledger->ledger_limit) {
                        /* XXX this is where you do BAD things */
-                       printf("Ledger limit exceeded ! ledger=%x lim=%d balance=%d\n",
+                       printf("Ledger limit exceeded ! ledger=%p lim=%d balance=%d\n",
                               ledger, ledger->ledger_limit,
                               ledger->ledger_balance);
                        ledger_unlock(ledger);
@@ -102,8 +111,10 @@ ledger_allocate(
                return(LEDGER_NULL);
 
        ledger->ledger_self = ipc_port_alloc_kernel();
-       if (ledger->ledger_self == IP_NULL)
+       if (ledger->ledger_self == IP_NULL) {
+               kfree(ledger, sizeof(ledger_data_t));
                return(LEDGER_NULL);
+       }
 
        ledger_lock_init(ledger);
        ledger->ledger_limit = limit;
@@ -203,7 +214,7 @@ kern_return_t ledger_create(
        (*new_ledger)->ledger_limit = transfer;
 
        /* Charge the ledger against the ledger_ledger */
-       ledger_ledger->ledger_balance += sizeof(ledger_data_t);
+       ledger_ledger->ledger_balance += (ledger_item_t)sizeof(ledger_data_t);
        ledger_unlock(parent_ledger);
 
        ledger_unlock(ledger_ledger);
@@ -248,7 +259,7 @@ kern_return_t ledger_terminate(
        (void) ledger_enter(ledger->ledger_parent, ledger->ledger_balance);
        
        /* adjust the balance of the creation ledger */
-       (void) ledger_enter(ledger->ledger_ledger, -sizeof(*ledger));
+       (void) ledger_enter(ledger->ledger_ledger, (ledger_item_t)-sizeof(*ledger));
 
        /* delete the ledger */
        ledger_deallocate(ledger);
@@ -389,8 +400,10 @@ convert_ledger_to_port(
 {
        ipc_port_t port;
 
-       port = ipc_port_make_send(ledger->ledger_self);
+       if (ledger == LEDGER_NULL)
+               return IP_NULL;
 
+       port = ipc_port_make_send(ledger->ledger_self);
        return port;
 }
 
@@ -401,7 +414,8 @@ ipc_port_t
 ledger_copy(
            ledger_t ledger)
 {
-       /* XXX reference counting */
-       assert(ledger);
+       if (ledger == LEDGER_NULL)
+               return IP_NULL;
+
        return(ipc_port_copy_send(ledger->ledger_self));
 }