xnu-792.25.20.tar.gz

[apple/xnu.git] / bsd / vfs / vfs_vnops.c

diff --git a/bsd/vfs/vfs_vnops.c b/bsd/vfs/vfs_vnops.c
index ff45786356ad2875b7d0c2a3f1b1d2c80565d181..d9d2b947e2c1960397cc75b52bcd7f182607b710 100644 (file)
--- a/bsd/vfs/vfs_vnops.c
+++ b/bsd/vfs/vfs_vnops.c
@@ -1,31 +1,23 @@
 /*
  * Copyright (c) 2000-2004 Apple Computer, Inc. All rights reserved.
  *
- * @APPLE_LICENSE_OSREFERENCE_HEADER_START@
+ * @APPLE_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.  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 
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES, 
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY, 
- * 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_OSREFERENCE_HEADER_END@
+ * 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 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.
+ * 
+ * @APPLE_LICENSE_HEADER_END@
  */
 /* Copyright (c) 1995 NeXT Computer, Inc. All Rights Reserved */
 /*
@@ -848,7 +840,7 @@ vn_ioctl(fp, com, data, p)
                return(error);
        }
        context.vc_proc = p;
-       context.vc_ucred = p->p_ucred;  /* XXX kauth_cred_get() ??? */
+       context.vc_ucred = kauth_cred_proc_ref(p);      /* XXX kauth_cred_get() ??? */
 
        switch (vp->v_type) {
 
@@ -915,6 +907,7 @@ vn_ioctl(fp, com, data, p)
        }
 out:
        (void)vnode_put(vp);
+       kauth_cred_unref(&context.vc_ucred);
        return(error);
 }
 
@@ -1006,13 +999,14 @@ vn_kqfilt_add(fp, kn, p)
        
        if ( (error = vnode_getwithref(vp)) == 0 ) {
                context.vc_proc = p;
-               context.vc_ucred = p->p_ucred;  /* XXX kauth_cred_get() ??? */
+               context.vc_ucred = kauth_cred_proc_ref(p);      /* XXX kauth_cred_get() ??? */
 
                funnel_state = thread_funnel_set(kernel_flock, TRUE);
                error = VNOP_KQFILT_ADD(vp, kn, &context);
                thread_funnel_set(kernel_flock, funnel_state);
 
                (void)vnode_put(vp);
+               kauth_cred_unref(&context.vc_ucred);
        }
        return (error);
 }
@@ -1031,13 +1025,14 @@ vn_kqfilt_remove(vp, ident, p)
        
        if ( (error = vnode_getwithref(vp)) == 0 ) {
                context.vc_proc = p;
-               context.vc_ucred = p->p_ucred;  /* XXX kauth_cred_get() ??? */
+               context.vc_ucred = kauth_cred_proc_ref(p);      /* XXX kauth_cred_get() ??? */
 
                funnel_state = thread_funnel_set(kernel_flock, TRUE);
                error = VNOP_KQFILT_REMOVE(vp, ident, &context);
                thread_funnel_set(kernel_flock, funnel_state);
 
                (void)vnode_put(vp);
+               kauth_cred_unref(&context.vc_ucred);
        }
        return (error);
 }