[src/netbsd-3-0]: src/sys/sys Pull up following revision(s) (requested by bly...

[ghen <ghen%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/1c9ede38b8f2
branches:  netbsd-3-0
changeset: 579424:1c9ede38b8f2
user:      ghen <ghen%NetBSD.org@localhost>
date:      Tue Jun 26 15:03:52 2007 +0000

description:
Pull up following revision(s) (requested by blymn in ticket #1471):
        sys/kern/kern_verifiedexec.c: patch
        sys/kern/vfs_syscalls.c: patch
        sys/sys/verified_exec.h: patch
Prevent users to rename a file to a veriexec protected file and to run
unfingerprinted files at strict level two or above.

diffstat:

 sys/sys/verified_exec.h |  7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diffs (28 lines):

diff -r a016a400e358 -r 1c9ede38b8f2 sys/sys/verified_exec.h
--- a/sys/sys/verified_exec.h   Sun Jun 24 19:45:38 2007 +0000
+++ b/sys/sys/verified_exec.h   Tue Jun 26 15:03:52 2007 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: verified_exec.h,v 1.6.2.9 2005/09/02 12:16:17 tron Exp $       */
+/*     $NetBSD: verified_exec.h,v 1.6.2.9.2.1 2007/06/26 15:03:52 ghen Exp $   */
 
 /*-
  * Copyright 2005 Elad Efrat <elad%bsd.org.il@localhost>
@@ -41,7 +41,7 @@
 #include <sys/param.h>
 #include <sys/hash.h>
 
-__KERNEL_RCSID(0, "$NetBSD: verified_exec.h,v 1.6.2.9 2005/09/02 12:16:17 tron Exp $");
+__KERNEL_RCSID(0, "$NetBSD: verified_exec.h,v 1.6.2.9.2.1 2007/06/26 15:03:52 ghen Exp $");
 
 /* Max length of the fingerprint type string, including terminating \0 char */
 #define VERIEXEC_TYPE_MAXLEN 9
@@ -188,7 +188,8 @@
 int veriexec_verify(struct proc *, struct vnode *, struct vattr *,
                    const u_char *, int, struct veriexec_hash_entry **);
 int veriexec_removechk(struct proc *, struct vnode *, const char *);
-int veriexec_renamechk(struct vnode *, const char *, const char *);
+int veriexec_renamechk(struct vnode *, struct vnode *, const char *,
+                      const char *);
 void veriexec_init_fp_ops(void);
 void veriexec_report(const u_char *, const u_char *, struct vattr *,
                     struct proc *, int, int, int);