BSD 4_3_Net_2 release

[unix-history] / usr / src / sys / kern / kern_ktrace.c

diff --git a/usr/src/sys/kern/kern_ktrace.c b/usr/src/sys/kern/kern_ktrace.c
index 50a63b7..dcde2c1 100644 (file)
--- a/usr/src/sys/kern/kern_ktrace.c
+++ b/usr/src/sys/kern/kern_ktrace.c
@@ -2,9 +2,35 @@
  * Copyright (c) 1989 The Regents of the University of California.
  * All rights reserved.
  *
  * Copyright (c) 1989 The Regents of the University of California.
  * All rights reserved.
  *

- * %sccs.include.redist.c%
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *     This product includes software developed by the University of
+ *     California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.

  *
  *

- *     @(#)kern_ktrace.c       7.13 (Berkeley) %G%
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ *     @(#)kern_ktrace.c       7.15 (Berkeley) 6/21/91

  */
 
 #ifdef KTRACE
  */
 
 #ifdef KTRACE


@@ -175,8 +201,9 @@ ktrace(curp, uap, retval)
                if (error = vn_open(&nd, curp, FREAD|FWRITE, 0))
                        return (error);
                vp = nd.ni_vp;
                if (error = vn_open(&nd, curp, FREAD|FWRITE, 0))
                        return (error);
                vp = nd.ni_vp;

+               VOP_UNLOCK(vp);

                if (vp->v_type != VREG) {
                if (vp->v_type != VREG) {

-                       vrele(vp);
+                       (void) vn_close(vp, FREAD|FWRITE, curp->p_ucred, curp);

                        return (EACCES);
                }
        }
                        return (EACCES);
                }
        }


@@ -189,7 +216,8 @@ ktrace(curp, uap, retval)
                                if (ktrcanset(curp, p)) {
                                        p->p_tracep = NULL;
                                        p->p_traceflag = 0;
                                if (ktrcanset(curp, p)) {
                                        p->p_tracep = NULL;
                                        p->p_traceflag = 0;

-                                       vrele(vp);
+                                       (void) vn_close(vp, FREAD|FWRITE,
+                                               p->p_ucred, p);

                                } else
                                        error = EPERM;
                        }
                                } else
                                        error = EPERM;
                        }


@@ -239,7 +267,7 @@ ktrace(curp, uap, retval)
                error = EPERM;
 done:
        if (vp != NULL)
                error = EPERM;
 done:
        if (vp != NULL)

-               vrele(vp);
+               (void) vn_close(vp, FWRITE, curp->p_ucred, curp);

        return (error);
 }
 
        return (error);
 }