xnu-792.25.20.tar.gz

[apple/xnu.git] / bsd / miscfs / union / union_subr.c

diff --git a/bsd/miscfs/union/union_subr.c b/bsd/miscfs/union/union_subr.c
index 80b3a0386ecf5139e2971c954d507e673b4f354a..7ff6930f35db1db09996f98795a20ff1d6e21719 100644 (file)
--- a/bsd/miscfs/union/union_subr.c
+++ b/bsd/miscfs/union/union_subr.c
@@ -1,29 +1,23 @@
 /*
  * Copyright (c) 2000-2004 Apple Computer, Inc. All rights reserved.
  *
- * @APPLE_OSREFERENCE_LICENSE_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.
+ * 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.
  * 
- * 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
+ * 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, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
+ * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
+ * License for the specific language governing rights and limitations
+ * under the License.
  * 
- * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
+ * @APPLE_LICENSE_HEADER_END@
  */
 /* Copyright (c) 1995 NeXT Computer, Inc. All Rights Reserved */
 /*
@@ -882,7 +876,6 @@ union_vn_create(vpp, un, p)
        struct proc *p;
 {
        struct vnode *vp;
-       kauth_cred_t cred = p->p_ucred;
        struct vnode_attr vat;
        struct vnode_attr *vap = &vat;
        struct vfs_context context;
@@ -895,7 +888,7 @@ union_vn_create(vpp, un, p)
        *vpp = NULLVP;
 
        context.vc_proc = p;
-       context.vc_ucred = p->p_ucred;
+       context.vc_ucred = kauth_cred_proc_ref(p);
 
        /*
         * Build a new componentname structure (for the same
@@ -919,12 +912,15 @@ union_vn_create(vpp, un, p)
        cn.cn_consume = 0;
 
        vnode_get(un->un_dirvp);
-       if (error = relookup(un->un_dirvp, &vp, &cn))
+       if (error = relookup(un->un_dirvp, &vp, &cn)) {
+               kauth_cred_unref(&context.vc_ucred);
                return (error);
+       }
        vnode_put(un->un_dirvp);
 
        if (vp) {
                vnode_put(un->un_dirvp);
+               kauth_cred_unref(&context.vc_ucred);
                vnode_put(vp);
                return (EEXIST);
        }
@@ -946,11 +942,14 @@ union_vn_create(vpp, un, p)
        VATTR_SET(vap, va_type, VREG);
        VATTR_SET(vap, va_mode, cmode);
 
-       if (error = vn_create(un->un_dirvp, &vp, &cn, vap, 0, &context))
+       if (error = vn_create(un->un_dirvp, &vp, &cn, vap, 0, &context)) {
+               kauth_cred_unref(&context.vc_ucred);
                return (error);
+       }
 
        if (error = VNOP_OPEN(vp, fmode, &context)) {
                vnode_put(vp);
+               kauth_cred_unref(&context.vc_ucred);
                return (error);
        }
 
@@ -959,6 +958,7 @@ union_vn_create(vpp, un, p)
                panic("union: v_writecount");
        vnode_unlock(vp);
        *vpp = vp;
+       kauth_cred_unref(&context.vc_ucred);
        return (0);
 }