diff --git a/share/man/man9/veriexec.9 b/share/man/man9/veriexec.9 index 22a78dbc31fe..9f9a39200ab7 100644 --- a/share/man/man9/veriexec.9 +++ b/share/man/man9/veriexec.9 @@ -1,4 +1,4 @@ -.\" $NetBSD: veriexec.9,v 1.12 2006/12/30 15:32:19 elad Exp $ +.\" $NetBSD: veriexec.9,v 1.13 2007/01/11 16:24:47 elad Exp $ .\" .\" Copyright 2006 Elad Efrat .\" Copyright 2006 Brett Lymn @@ -27,7 +27,7 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.Dd December 30, 2006 +.Dd January 11, 2007 .Dt VERIEXEC 9 .Os .Sh NAME @@ -181,12 +181,12 @@ is expected to have the following: .It fp-type string fingerprint hashing algorithm .It fp data the fingerprint .El -.It Ft int Fn veriexec_table_delete "struct mount *mp" +.It Ft int Fn veriexec_table_delete "struct lwp *l" "struct mount *mp" Remove .Em Veriexec table for mount-point .Ar mp . -.It Ft int Fn veriexec_file_delete "struct vnode *vp" +.It Ft int Fn veriexec_file_delete "struct lwp *l" "struct vnode *vp" Remove .Em Veriexec entry for diff --git a/sys/dev/verified_exec.c b/sys/dev/verified_exec.c index ad832d81055e..c5fbfd884a2a 100644 --- a/sys/dev/verified_exec.c +++ b/sys/dev/verified_exec.c @@ -1,4 +1,4 @@ -/* $NetBSD: verified_exec.c,v 1.56 2007/01/11 15:08:47 elad Exp $ */ +/* $NetBSD: verified_exec.c,v 1.57 2007/01/11 16:24:47 elad Exp $ */ /*- * Copyright (c) 2005, 2006 Elad Efrat @@ -30,9 +30,9 @@ #include #if defined(__NetBSD__) -__KERNEL_RCSID(0, "$NetBSD: verified_exec.c,v 1.56 2007/01/11 15:08:47 elad Exp $"); +__KERNEL_RCSID(0, "$NetBSD: verified_exec.c,v 1.57 2007/01/11 16:24:47 elad Exp $"); #else -__RCSID("$Id: verified_exec.c,v 1.56 2007/01/11 15:08:47 elad Exp $\n$NetBSD: verified_exec.c,v 1.56 2007/01/11 15:08:47 elad Exp $"); +__RCSID("$Id: verified_exec.c,v 1.57 2007/01/11 16:24:47 elad Exp $\n$NetBSD: verified_exec.c,v 1.57 2007/01/11 16:24:47 elad Exp $"); #endif #include @@ -241,9 +241,9 @@ veriexec_delete(prop_dictionary_t dict, struct lwp *l) /* XXX this should be done differently... */ if (nid.ni_vp->v_type == VREG) - error = veriexec_file_delete(nid.ni_vp); + error = veriexec_file_delete(l, nid.ni_vp); else if (nid.ni_vp->v_type == VDIR) - error = veriexec_table_delete(nid.ni_vp->v_mount); + error = veriexec_table_delete(l, nid.ni_vp->v_mount); vrele(nid.ni_vp); diff --git a/sys/kern/kern_verifiedexec.c b/sys/kern/kern_verifiedexec.c index 9827247134d5..a62ecb797d77 100644 --- a/sys/kern/kern_verifiedexec.c +++ b/sys/kern/kern_verifiedexec.c @@ -1,4 +1,4 @@ -/* $NetBSD: kern_verifiedexec.c,v 1.93 2007/01/11 15:10:25 elad Exp $ */ +/* $NetBSD: kern_verifiedexec.c,v 1.94 2007/01/11 16:24:48 elad Exp $ */ /*- * Copyright (c) 2005, 2006 Elad Efrat @@ -29,7 +29,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: kern_verifiedexec.c,v 1.93 2007/01/11 15:10:25 elad Exp $"); +__KERNEL_RCSID(0, "$NetBSD: kern_verifiedexec.c,v 1.94 2007/01/11 16:24:48 elad Exp $"); #include "opt_veriexec.h" @@ -1139,7 +1139,7 @@ veriexec_table_add(struct lwp *l, prop_dictionary_t dict) } int -veriexec_table_delete(struct mount *mp) { +veriexec_table_delete(struct lwp *l, struct mount *mp) { struct veriexec_table_entry *vte; vte = veriexec_table_lookup(mp); @@ -1150,7 +1150,7 @@ veriexec_table_delete(struct mount *mp) { } int -veriexec_file_delete(struct vnode *vp) { +veriexec_file_delete(struct lwp *l, struct vnode *vp) { struct veriexec_table_entry *vte; int error; diff --git a/sys/sys/verified_exec.h b/sys/sys/verified_exec.h index b4c01618202b..ec4db69a0194 100644 --- a/sys/sys/verified_exec.h +++ b/sys/sys/verified_exec.h @@ -1,4 +1,4 @@ -/* $NetBSD: verified_exec.h,v 1.52 2007/01/11 15:10:25 elad Exp $ */ +/* $NetBSD: verified_exec.h,v 1.53 2007/01/11 16:24:48 elad Exp $ */ /*- * Copyright (c) 2005, 2006 Elad Efrat @@ -110,8 +110,8 @@ int veriexec_page_verify(struct veriexec_file_entry *, struct vm_page *, size_t, struct lwp *); #endif /* notyet */ boolean_t veriexec_lookup(struct vnode *); -int veriexec_file_delete(struct vnode *); -int veriexec_table_delete(struct mount *); +int veriexec_file_delete(struct lwp *, struct vnode *); +int veriexec_table_delete(struct lwp *, struct mount *); int veriexec_convert(struct vnode *, prop_dictionary_t); void veriexec_report(const u_char *, const u_char *, struct lwp *, int); void veriexec_purge(struct vnode *);