xnu-792.18.15.tar.gz

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

diff --git a/bsd/kern/kern_symfile.c b/bsd/kern/kern_symfile.c
index 5be8107299b7351d1409e0e48cccd1b25331d1e5..7d25e43aa1166f812d50f2969fe836393d73a98d 100644 (file)
--- a/bsd/kern/kern_symfile.c
+++ b/bsd/kern/kern_symfile.c
@@ -1,14 +1,19 @@
 /*
  * Copyright (c) 2000-2004 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) 1998 Apple Computer, Inc.  All rights reserved.
  *
@@ -90,7 +95,7 @@ static int
 output_kernel_symbols(struct proc *p)
 {
     struct vnode               *vp;
-    kauth_cred_t               cred = p->p_ucred;      /* XXX */
+    kauth_cred_t               cred = p->p_ucred;      /* XXX unsafe */
     struct vnode_attr          va;
     struct vfs_context         context;
     struct load_command                *cmd;
@@ -115,6 +120,9 @@ output_kernel_symbols(struct proc *p)
     orig_mh    = NULL;
     orig_st    = NULL;
     
+    context.vc_proc = p;
+    context.vc_ucred = kauth_cred_proc_ref(p);
+
     // Dispose of unnecessary gumf, the booter doesn't need to load these
     rc_mh = IODTGetLoaderInfo("Kernel-__HEADER",
                                (void **)&orig_mh, &orig_mhsize);
@@ -135,9 +143,6 @@ output_kernel_symbols(struct proc *p)
     if (rootdevice[0] == 'e' && rootdevice[1] == 'n')
        goto out;
 
-    context.vc_proc = p;
-    context.vc_ucred = cred;
-
     if ((error = vnode_open("mach.sym", (O_CREAT | FWRITE), (S_IRUSR | S_IRGRP | S_IROTH), 0, &vp, &context)))
         goto out;
 
@@ -326,6 +331,7 @@ out:
        if (!error) error = error1;
     }
 
+    kauth_cred_unref(&context.vc_ucred);
     return(error);
 }
 /*
@@ -374,7 +380,6 @@ kern_open_file_for_direct_io(const char * name,
     struct kern_direct_file_io_ref_t * ref;
 
     struct proc                *p;
-    struct ucred               *cred;
     struct vnode_attr          va;
     int                                error;
     off_t                      f_offset;
@@ -398,9 +403,8 @@ kern_open_file_for_direct_io(const char * name,
 
     ref->vp = NULL;
     p = current_proc();                // kernproc;
-    cred = p->p_ucred;
     ref->context.vc_proc = p;
-    ref->context.vc_ucred = cred;
+    ref->context.vc_ucred = kauth_cred_proc_ref(p);
 
     if ((error = vnode_open(name, (O_CREAT | FWRITE), (0), 0, &ref->vp, &ref->context)))
         goto out;
@@ -537,10 +541,14 @@ out:
     kprintf("kern_open_file_for_direct_io(%d)\n", error);
 
     if (error && ref) {
-       if (ref->vp)
-           vnode_close(ref->vp, FWRITE, &ref->context);
-
-       kfree(ref, sizeof(struct kern_direct_file_io_ref_t));
+               if (ref->vp) {
+                       vnode_close(ref->vp, FWRITE, &ref->context);
+                       ref->vp = NULLVP;
+               }
+
+               kauth_cred_unref(&ref->context.vc_ucred);
+               kfree(ref, sizeof(struct kern_direct_file_io_ref_t));
+               ref = NULL;
     }
 
     return(ref);
@@ -566,7 +574,9 @@ kern_close_file_for_direct_io(struct kern_direct_file_io_ref_t * ref)
        if (ref->vp) {
            error = vnode_close(ref->vp, FWRITE, &ref->context);
            kprintf("vnode_close(%d)\n", error);
+               ref->vp = NULLVP;
        }
+       kauth_cred_unref(&ref->context.vc_ucred);
        kfree(ref, sizeof(struct kern_direct_file_io_ref_t));
     }
 }