xnu-517.9.4.tar.gz

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

diff --git a/bsd/vfs/vfs_lookup.c b/bsd/vfs/vfs_lookup.c
index 189de5062490168e24f05cb74e26b4718700274f..d65c10b9078348ca3e0420d620fb8f6a80e9dfff 100644 (file)
--- a/bsd/vfs/vfs_lookup.c
+++ b/bsd/vfs/vfs_lookup.c
@@ -1,24 +1,21 @@
 /*
 /*

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

  *
  * @APPLE_LICENSE_HEADER_START@
  * 
  *
  * @APPLE_LICENSE_HEADER_START@
  * 

- * Copyright (c) 1999-2003 Apple Computer, Inc.  All Rights Reserved.
+ * 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. 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,
  * 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_LICENSE_HEADER_END@
  */
  * 
  * @APPLE_LICENSE_HEADER_END@
  */


@@ -64,6 +61,7 @@
  */
 
 #include <sys/param.h>
  */
 
 #include <sys/param.h>

+#include <sys/systm.h>

 #include <sys/syslimits.h>
 #include <sys/time.h>
 #include <sys/namei.h>
 #include <sys/syslimits.h>
 #include <sys/time.h>
 #include <sys/namei.h>


@@ -77,10 +75,14 @@
 #include <sys/kdebug.h>
 #include <sys/unistd.h>                /* For _PC_NAME_MAX */
 
 #include <sys/kdebug.h>
 #include <sys/unistd.h>                /* For _PC_NAME_MAX */
 

+#include <bsm/audit_kernel.h>
+

 #if KTRACE
 #include <sys/ktrace.h>
 #endif
 
 #if KTRACE
 #include <sys/ktrace.h>
 #endif
 

+static void kdebug_lookup(struct vnode *dp, struct componentname *cnp);
+

 /*
  * Convert a pathname into a pointer to a locked inode.
  *
 /*
  * Convert a pathname into a pointer to a locked inode.
  *


@@ -113,6 +115,7 @@ namei(ndp)
        int error, linklen;
        struct componentname *cnp = &ndp->ni_cnd;
        struct proc *p = cnp->cn_proc;
        int error, linklen;
        struct componentname *cnp = &ndp->ni_cnd;
        struct proc *p = cnp->cn_proc;

+       char *tmppn;

 
        ndp->ni_cnd.cn_cred = ndp->ni_cnd.cn_proc->p_ucred;
 #if DIAGNOSTIC
 
        ndp->ni_cnd.cn_cred = ndp->ni_cnd.cn_proc->p_ucred;
 #if DIAGNOSTIC


@@ -123,7 +126,7 @@ namei(ndp)
        if (cnp->cn_flags & OPMASK)
                panic ("namei: flags contaminated with nameiops");
 #endif
        if (cnp->cn_flags & OPMASK)
                panic ("namei: flags contaminated with nameiops");
 #endif

-       fdp = cnp->cn_proc->p_fd;
+       fdp = p->p_fd;

 
        /*
         * Get a buffer for the name to be translated, and copy the
 
        /*
         * Get a buffer for the name to be translated, and copy the


@@ -133,28 +136,42 @@ namei(ndp)
                MALLOC_ZONE(cnp->cn_pnbuf, caddr_t,
                                MAXPATHLEN, M_NAMEI, M_WAITOK);
                cnp->cn_pnlen = MAXPATHLEN;
                MALLOC_ZONE(cnp->cn_pnbuf, caddr_t,
                                MAXPATHLEN, M_NAMEI, M_WAITOK);
                cnp->cn_pnlen = MAXPATHLEN;

+               cnp->cn_flags |= HASBUF;

        }
        if (ndp->ni_segflg == UIO_SYSSPACE)
                error = copystr(ndp->ni_dirp, cnp->cn_pnbuf,
        }
        if (ndp->ni_segflg == UIO_SYSSPACE)
                error = copystr(ndp->ni_dirp, cnp->cn_pnbuf,

-                           MAXPATHLEN, &ndp->ni_pathlen);
+                           MAXPATHLEN, (size_t *)&ndp->ni_pathlen);

        else
                error = copyinstr(ndp->ni_dirp, cnp->cn_pnbuf,
        else
                error = copyinstr(ndp->ni_dirp, cnp->cn_pnbuf,

-                           MAXPATHLEN, &ndp->ni_pathlen);
+                           MAXPATHLEN, (size_t *)&ndp->ni_pathlen);
+
+       /* If we are auditing the kernel pathname, save the user pathname */
+       if (cnp->cn_flags & AUDITVNPATH1)
+               AUDIT_ARG(upath, p, cnp->cn_pnbuf, ARG_UPATH1); 
+       if (cnp->cn_flags & AUDITVNPATH2)
+               AUDIT_ARG(upath, p, cnp->cn_pnbuf, ARG_UPATH2); 
+

        /*
         * Do not allow empty pathnames
         */
        if (!error && *cnp->cn_pnbuf == '\0')
                error = ENOENT;
 
        /*
         * Do not allow empty pathnames
         */
        if (!error && *cnp->cn_pnbuf == '\0')
                error = ENOENT;
 

+       if (!error && ((dp = fdp->fd_cdir) == NULL))
+               error = EPERM;          /* 3382843 */
+

        if (error) {
        if (error) {

-               _FREE_ZONE(cnp->cn_pnbuf, cnp->cn_pnlen, M_NAMEI);
+               tmppn = cnp->cn_pnbuf;
+               cnp->cn_pnbuf = NULL;
+               cnp->cn_flags &= ~HASBUF;
+               FREE_ZONE(tmppn, cnp->cn_pnlen, M_NAMEI);

                ndp->ni_vp = NULL;
                return (error);
        }
        ndp->ni_loopcnt = 0;
 #if KTRACE
                ndp->ni_vp = NULL;
                return (error);
        }
        ndp->ni_loopcnt = 0;
 #if KTRACE

-       if (KTRPOINT(cnp->cn_proc, KTR_NAMEI))
-               ktrnamei(cnp->cn_proc->p_tracep, cnp->cn_pnbuf);
+       if (KTRPOINT(p, KTR_NAMEI))
+               ktrnamei(p->p_tracep, cnp->cn_pnbuf);

 #endif
 
        /*
 #endif
 
        /*


@@ -162,7 +179,13 @@ namei(ndp)
         */
        if ((ndp->ni_rootdir = fdp->fd_rdir) == NULL)
                ndp->ni_rootdir = rootvnode;
         */
        if ((ndp->ni_rootdir = fdp->fd_rdir) == NULL)
                ndp->ni_rootdir = rootvnode;

-       dp = fdp->fd_cdir;
+       if (ndp->ni_cnd.cn_flags & USEDVP) {
+           dp = ndp->ni_dvp;
+           ndp->ni_dvp = NULL;
+       } else {
+           dp = fdp->fd_cdir;
+       }
+

        VREF(dp);
        for (;;) {
                /*
        VREF(dp);
        for (;;) {
                /*


@@ -181,7 +204,11 @@ namei(ndp)
                }
                ndp->ni_startdir = dp;
                if (error = lookup(ndp)) {
                }
                ndp->ni_startdir = dp;
                if (error = lookup(ndp)) {

-                       FREE_ZONE(cnp->cn_pnbuf, cnp->cn_pnlen, M_NAMEI);
+                       long len = cnp->cn_pnlen;
+                       tmppn = cnp->cn_pnbuf;
+                       cnp->cn_pnbuf = NULL;
+                       cnp->cn_flags &= ~HASBUF;
+                       FREE_ZONE(tmppn, len, M_NAMEI);

                        return (error);
                }
                /*
                        return (error);
                }
                /*


@@ -189,8 +216,10 @@ namei(ndp)
                 */
                if ((cnp->cn_flags & ISSYMLINK) == 0) {
                        if ((cnp->cn_flags & (SAVENAME | SAVESTART)) == 0) {
                 */
                if ((cnp->cn_flags & ISSYMLINK) == 0) {
                        if ((cnp->cn_flags & (SAVENAME | SAVESTART)) == 0) {

-                               FREE_ZONE(cnp->cn_pnbuf,
-                                               cnp->cn_pnlen, M_NAMEI);
+                               tmppn = cnp->cn_pnbuf;
+                               cnp->cn_pnbuf = NULL;
+                               cnp->cn_flags &= ~HASBUF;
+                               FREE_ZONE(tmppn, cnp->cn_pnlen, M_NAMEI);

                        } else {
                                cnp->cn_flags |= HASBUF;
                        }
                        } else {
                                cnp->cn_flags |= HASBUF;
                        }


@@ -218,28 +247,35 @@ namei(ndp)
                auio.uio_resid = MAXPATHLEN;
                if (error = VOP_READLINK(ndp->ni_vp, &auio, cnp->cn_cred)) {
                        if (ndp->ni_pathlen > 1)
                auio.uio_resid = MAXPATHLEN;
                if (error = VOP_READLINK(ndp->ni_vp, &auio, cnp->cn_cred)) {
                        if (ndp->ni_pathlen > 1)

-                               _FREE_ZONE(cp, MAXPATHLEN, M_NAMEI);
+                               FREE_ZONE(cp, MAXPATHLEN, M_NAMEI);

                        break;
                }
                linklen = MAXPATHLEN - auio.uio_resid;
                if (linklen + ndp->ni_pathlen >= MAXPATHLEN) {
                        if (ndp->ni_pathlen > 1)
                        break;
                }
                linklen = MAXPATHLEN - auio.uio_resid;
                if (linklen + ndp->ni_pathlen >= MAXPATHLEN) {
                        if (ndp->ni_pathlen > 1)

-                               _FREE_ZONE(cp, MAXPATHLEN, M_NAMEI);
+                               FREE_ZONE(cp, MAXPATHLEN, M_NAMEI);

                        error = ENAMETOOLONG;
                        break;
                }
                if (ndp->ni_pathlen > 1) {
                        error = ENAMETOOLONG;
                        break;
                }
                if (ndp->ni_pathlen > 1) {

+                       long len = cnp->cn_pnlen;
+                       tmppn = cnp->cn_pnbuf;

                        bcopy(ndp->ni_next, cp + linklen, ndp->ni_pathlen);
                        bcopy(ndp->ni_next, cp + linklen, ndp->ni_pathlen);

-                       FREE_ZONE(cnp->cn_pnbuf, cnp->cn_pnlen, M_NAMEI);

                        cnp->cn_pnbuf = cp;
                        cnp->cn_pnlen = MAXPATHLEN;
                        cnp->cn_pnbuf = cp;
                        cnp->cn_pnlen = MAXPATHLEN;

+                       FREE_ZONE(tmppn, len, M_NAMEI);

                } else
                        cnp->cn_pnbuf[linklen] = '\0';
                ndp->ni_pathlen += linklen;
                vput(ndp->ni_vp);
                dp = ndp->ni_dvp;
        }
                } else
                        cnp->cn_pnbuf[linklen] = '\0';
                ndp->ni_pathlen += linklen;
                vput(ndp->ni_vp);
                dp = ndp->ni_dvp;
        }

-       FREE_ZONE(cnp->cn_pnbuf, cnp->cn_pnlen, M_NAMEI);
+
+       tmppn = cnp->cn_pnbuf;
+       cnp->cn_pnbuf = NULL;
+       cnp->cn_flags &= ~HASBUF;
+       FREE_ZONE(tmppn, cnp->cn_pnlen, M_NAMEI);
+

        vrele(ndp->ni_dvp);
        vput(ndp->ni_vp);
        ndp->ni_vp = NULL;
        vrele(ndp->ni_dvp);
        vput(ndp->ni_vp);
        ndp->ni_vp = NULL;


@@ -297,7 +333,7 @@ lookup(ndp)
        int wantparent;                 /* 1 => wantparent or lockparent flag */
        int dp_unlocked = 0;    /* 1 => dp already VOP_UNLOCK()-ed */
        int rdonly;                     /* lookup read-only flag bit */
        int wantparent;                 /* 1 => wantparent or lockparent flag */
        int dp_unlocked = 0;    /* 1 => dp already VOP_UNLOCK()-ed */
        int rdonly;                     /* lookup read-only flag bit */

-       int trailing_slash;
+       int trailing_slash = 0;

        int error = 0;
        struct componentname *cnp = &ndp->ni_cnd;
        struct proc *p = cnp->cn_proc;
        int error = 0;
        struct componentname *cnp = &ndp->ni_cnd;
        struct proc *p = cnp->cn_proc;


@@ -318,28 +354,45 @@ lookup(ndp)
        dp = ndp->ni_startdir;
        ndp->ni_startdir = NULLVP;
        vn_lock(dp, LK_EXCLUSIVE | LK_RETRY, p);
        dp = ndp->ni_startdir;
        ndp->ni_startdir = NULLVP;
        vn_lock(dp, LK_EXCLUSIVE | LK_RETRY, p);

+       cnp->cn_consume = 0;

 
 dirloop:
        /*
         * Search a new directory.
         *
         * The cn_hash value is for use by vfs_cache.
 
 dirloop:
        /*
         * Search a new directory.
         *
         * The cn_hash value is for use by vfs_cache.

-        * Check pathconf for maximun length of name

         * The last component of the filename is left accessible via
         * cnp->cn_nameptr for callers that need the name. Callers needing
         * the name set the SAVENAME flag. When done, they assume
         * responsibility for freeing the pathname buffer.
         */
         * The last component of the filename is left accessible via
         * cnp->cn_nameptr for callers that need the name. Callers needing
         * the name set the SAVENAME flag. When done, they assume
         * responsibility for freeing the pathname buffer.
         */

-       cnp->cn_consume = 0;
-       cnp->cn_hash = 0;
-       for (cp = cnp->cn_nameptr, i=1; *cp != 0 && *cp != '/'; i++, cp++)
-               cnp->cn_hash += (unsigned char)*cp * i;
+       {
+               register unsigned int hash;
+               register unsigned int ch;
+               register int i;
+       
+               hash = 0;
+               cp = cnp->cn_nameptr;
+               ch = *cp;
+               if (ch == '\0') {
+                       cnp->cn_namelen = 0;
+                       goto emptyname;
+               }
+
+               for (i = 1; (ch != '/') && (ch != '\0'); i++) {
+                       hash += ch * i;
+                       ch = *(++cp);
+               }
+               cnp->cn_hash = hash;
+       }

        cnp->cn_namelen = cp - cnp->cn_nameptr;
        cnp->cn_namelen = cp - cnp->cn_nameptr;

-    if (VOP_PATHCONF(dp, _PC_NAME_MAX, &namemax))
-               namemax = NAME_MAX;
-    if (cnp->cn_namelen > namemax) {
-               error = ENAMETOOLONG;
-               goto bad;
+       if (cnp->cn_namelen > NCHNAMLEN) {
+               if (VOP_PATHCONF(dp, _PC_NAME_MAX, &namemax))
+                       namemax = NAME_MAX;
+               if (cnp->cn_namelen > namemax) {
+                       error = ENAMETOOLONG;
+                       goto bad;
+               }

        }
 #ifdef NAMEI_DIAGNOSTIC
        { char c = *cp;
        }
 #ifdef NAMEI_DIAGNOSTIC
        { char c = *cp;


@@ -371,43 +424,12 @@ dirloop:
        cnp->cn_flags |= MAKEENTRY;
        if (*cp == '\0' && docache == 0)
                cnp->cn_flags &= ~MAKEENTRY;
        cnp->cn_flags |= MAKEENTRY;
        if (*cp == '\0' && docache == 0)
                cnp->cn_flags &= ~MAKEENTRY;

-       if (cnp->cn_namelen == 2 &&
-           cnp->cn_nameptr[1] == '.' && cnp->cn_nameptr[0] == '.')
-               cnp->cn_flags |= ISDOTDOT;
-       else
-               cnp->cn_flags &= ~ISDOTDOT;
+

        if (*ndp->ni_next == 0)
                cnp->cn_flags |= ISLASTCN;
        else
                cnp->cn_flags &= ~ISLASTCN;
 
        if (*ndp->ni_next == 0)
                cnp->cn_flags |= ISLASTCN;
        else
                cnp->cn_flags &= ~ISLASTCN;
 

-
-       /*
-        * Check for degenerate name (e.g. / or "")
-        * which is a way of talking about a directory,
-        * e.g. like "/." or ".".
-        */
-       if (cnp->cn_nameptr[0] == '\0') {
-               if (dp->v_type != VDIR) {
-                       error = ENOTDIR;
-                       goto bad;
-               }
-               if (cnp->cn_nameiop != LOOKUP) {
-                       error = EISDIR;
-                       goto bad;
-               }
-               if (wantparent) {
-                       ndp->ni_dvp = dp;
-                       VREF(dp);
-               }
-               ndp->ni_vp = dp;
-               if (!(cnp->cn_flags & (LOCKPARENT | LOCKLEAF)))
-                       VOP_UNLOCK(dp, 0, p);
-               if (cnp->cn_flags & SAVESTART)
-                       panic("lookup: SAVESTART");
-               return (0);
-       }
-

        /*
         * Handle "..": two special cases.
         * 1. If at root directory (e.g. after chroot)
        /*
         * Handle "..": two special cases.
         * 1. If at root directory (e.g. after chroot)


@@ -418,7 +440,10 @@ dirloop:
         *    vnode which was mounted on so we take the
         *    .. in the other file system.
         */
         *    vnode which was mounted on so we take the
         *    .. in the other file system.
         */

-       if (cnp->cn_flags & ISDOTDOT) {
+       if (cnp->cn_namelen == 2 &&
+           cnp->cn_nameptr[1] == '.' && cnp->cn_nameptr[0] == '.') {
+               cnp->cn_flags |= ISDOTDOT;
+

                for (;;) {
                        if (dp == ndp->ni_rootdir || dp == rootvnode) {
                                ndp->ni_dvp = dp;
                for (;;) {
                        if (dp == ndp->ni_rootdir || dp == rootvnode) {
                                ndp->ni_dvp = dp;


@@ -440,6 +465,8 @@ dirloop:
                        VREF(dp);
                        vn_lock(dp, LK_EXCLUSIVE | LK_RETRY, p);
                }
                        VREF(dp);
                        vn_lock(dp, LK_EXCLUSIVE | LK_RETRY, p);
                }

+       } else {
+               cnp->cn_flags &= ~ISDOTDOT;

        }
 
        /*
        }
 
        /*


@@ -508,6 +535,19 @@ unionlookup:
                ndp->ni_next += cnp->cn_consume;
                ndp->ni_pathlen -= cnp->cn_consume;
                cnp->cn_consume = 0;
                ndp->ni_next += cnp->cn_consume;
                ndp->ni_pathlen -= cnp->cn_consume;
                cnp->cn_consume = 0;

+       } else {
+           int isdot_or_dotdot;
+
+           isdot_or_dotdot = (cnp->cn_namelen == 1 && cnp->cn_nameptr[0] == '.') || (cnp->cn_flags & ISDOTDOT);
+           
+           if (VNAME(ndp->ni_vp) == NULL &&  isdot_or_dotdot == 0) {
+               VNAME(ndp->ni_vp) = add_name(cnp->cn_nameptr, cnp->cn_namelen, cnp->cn_hash, 0);
+           }
+           if (VPARENT(ndp->ni_vp) == NULL && isdot_or_dotdot == 0) {
+               if (vget(ndp->ni_dvp, 0, p) == 0) {
+                   VPARENT(ndp->ni_vp) = ndp->ni_dvp;
+               }
+           }

        }
 
        dp = ndp->ni_vp;
        }
 
        dp = ndp->ni_vp;


@@ -517,8 +557,10 @@ unionlookup:
         */
        while (dp->v_type == VDIR && (mp = dp->v_mountedhere) &&
               (cnp->cn_flags & NOCROSSMOUNT) == 0) {
         */
        while (dp->v_type == VDIR && (mp = dp->v_mountedhere) &&
               (cnp->cn_flags & NOCROSSMOUNT) == 0) {

-               if (vfs_busy(mp, 0, 0, p))
-                       continue;
+               if (vfs_busy(mp, LK_NOWAIT, 0, p)) {
+                       error = ENOENT;
+                       goto bad2;
+               }

                VOP_UNLOCK(dp, 0, p);
                error = VFS_ROOT(mp, &tdp);
                vfs_unbusy(mp, p);
                VOP_UNLOCK(dp, 0, p);
                error = VFS_ROOT(mp, &tdp);
                vfs_unbusy(mp, p);


@@ -543,9 +585,12 @@ unionlookup:
        /*
         * Check for bogus trailing slashes.
         */
        /*
         * Check for bogus trailing slashes.
         */

-        if (trailing_slash && dp->v_type != VDIR) {
-               error = ENOTDIR;
-               goto bad2;
+       if (trailing_slash) {
+               if (dp->v_type != VDIR) {
+                       error = ENOTDIR;
+                       goto bad2;
+               }
+               trailing_slash = 0;

         }
 
 nextname:
         }
 
 nextname:


@@ -554,7 +599,8 @@ nextname:
         * continue at next component, else return.
         */
        if (*ndp->ni_next == '/') {
         * continue at next component, else return.
         */
        if (*ndp->ni_next == '/') {

-               cnp->cn_nameptr = ndp->ni_next;
+               cnp->cn_nameptr = ndp->ni_next + 1;
+               ndp->ni_pathlen--;

                while (*cnp->cn_nameptr == '/') {
                        cnp->cn_nameptr++;
                        ndp->ni_pathlen--;
                while (*cnp->cn_nameptr == '/') {
                        cnp->cn_nameptr++;
                        ndp->ni_pathlen--;


@@ -577,12 +623,47 @@ nextname:
        }
        if (!wantparent)
                vrele(ndp->ni_dvp);
        }
        if (!wantparent)
                vrele(ndp->ni_dvp);

+       if (cnp->cn_flags & AUDITVNPATH1)
+               AUDIT_ARG(vnpath, dp, ARG_VNODE1);
+       else if (cnp->cn_flags & AUDITVNPATH2)
+               AUDIT_ARG(vnpath, dp, ARG_VNODE2);

        if ((cnp->cn_flags & LOCKLEAF) == 0)
                VOP_UNLOCK(dp, 0, p);
        if (kdebug_enable)
                kdebug_lookup(dp, cnp);
        return (0);
 
        if ((cnp->cn_flags & LOCKLEAF) == 0)
                VOP_UNLOCK(dp, 0, p);
        if (kdebug_enable)
                kdebug_lookup(dp, cnp);
        return (0);
 

+emptyname:
+       /*
+        * A degenerate name (e.g. / or "") which is a way of
+        * talking about a directory, e.g. like "/." or ".".
+        */
+       if (dp->v_type != VDIR) {
+               error = ENOTDIR;
+               goto bad;
+       }
+       if (cnp->cn_nameiop != LOOKUP) {
+               error = EISDIR;
+               goto bad;
+       }
+       if (wantparent) {
+               ndp->ni_dvp = dp;
+               VREF(dp);
+       }
+       cnp->cn_flags &= ~ISDOTDOT;
+       cnp->cn_flags |= ISLASTCN;
+       ndp->ni_next = cp;
+       ndp->ni_vp = dp;
+       if (cnp->cn_flags & AUDITVNPATH1)
+               AUDIT_ARG(vnpath, dp, ARG_VNODE1);
+       else if (cnp->cn_flags & AUDITVNPATH2)
+               AUDIT_ARG(vnpath, dp, ARG_VNODE2);
+       if (!(cnp->cn_flags & (LOCKPARENT | LOCKLEAF)))
+               VOP_UNLOCK(dp, 0, p);
+       if (cnp->cn_flags & SAVESTART)
+               panic("lookup: SAVESTART");
+       return (0);
+

 bad2:
        if ((cnp->cn_flags & LOCKPARENT) && *ndp->ni_next == '\0')
                VOP_UNLOCK(ndp->ni_dvp, 0, p);
 bad2:
        if ((cnp->cn_flags & LOCKPARENT) && *ndp->ni_next == '\0')
                VOP_UNLOCK(ndp->ni_dvp, 0, p);


@@ -615,7 +696,7 @@ relookup(dvp, vpp, cnp)
        int rdonly;                     /* lookup read-only flag bit */
        int error = 0;
 #ifdef NAMEI_DIAGNOSTIC
        int rdonly;                     /* lookup read-only flag bit */
        int error = 0;
 #ifdef NAMEI_DIAGNOSTIC

-       int newhash;                    /* DEBUG: check name hash */
+       int i, newhash;                 /* DEBUG: check name hash */

        char *cp;                       /* DEBUG: check name ptr/len */
 #endif
 
        char *cp;                       /* DEBUG: check name ptr/len */
 #endif
 


@@ -643,8 +724,8 @@ relookup(dvp, vpp, cnp)
         * responsibility for freeing the pathname buffer.
         */
 #ifdef NAMEI_DIAGNOSTIC
         * responsibility for freeing the pathname buffer.
         */
 #ifdef NAMEI_DIAGNOSTIC

-       for (newhash = 0, cp = cnp->cn_nameptr; *cp != 0 && *cp != '/'; cp++)
-               newhash += (unsigned char)*cp;
+       for (i=1, newhash = 0, cp = cnp->cn_nameptr; *cp != 0 && *cp != '/'; cp++)
+               newhash += (unsigned char)*cp * i;

        if (newhash != cnp->cn_hash)
                panic("relookup: bad hash");
        if (cnp->cn_namelen != cp - cnp->cn_nameptr)
        if (newhash != cnp->cn_hash)
                panic("relookup: bad hash");
        if (cnp->cn_namelen != cp - cnp->cn_nameptr)


@@ -748,11 +829,12 @@ bad:
 
 #define NUMPARMS 23
 
 
 #define NUMPARMS 23
 

+static void

 kdebug_lookup(dp, cnp)
 kdebug_lookup(dp, cnp)

-        struct vnode *dp;
+       struct vnode *dp;

        struct componentname *cnp;
 {
        struct componentname *cnp;
 {

-        register int i, n;
+       register int i, n;

        register int dbg_namelen;
        register int save_dbg_namelen;
        register char *dbg_nameptr;
        register int dbg_namelen;
        register int save_dbg_namelen;
        register char *dbg_nameptr;


@@ -802,7 +884,7 @@ kdebug_lookup(dp, cnp)
          entries, we must mark the start of the path's string.
        */
        KERNEL_DEBUG_CONSTANT((FSDBG_CODE(DBG_FSRW,36)) | DBG_FUNC_START,
          entries, we must mark the start of the path's string.
        */
        KERNEL_DEBUG_CONSTANT((FSDBG_CODE(DBG_FSRW,36)) | DBG_FUNC_START,

-                             dp, dbg_parms[0], dbg_parms[1], dbg_parms[2], 0);
+               (unsigned int)dp, dbg_parms[0], dbg_parms[1], dbg_parms[2], 0);

 
        for (dbg_namelen = save_dbg_namelen-12, i=3;
             dbg_namelen > 0;
 
        for (dbg_namelen = save_dbg_namelen-12, i=3;
             dbg_namelen > 0;