 @@ -1,14 +1,14 @@
-/*	$NetBSD: verified_exec.c,v 1.63 2007/12/11 12:16:14 lukem Exp $	*/
+/*	$NetBSD: verified_exec.c,v 1.63.22.1 2008/12/18 00:56:27 snj Exp $	*/
 /*-
  * Copyright (c) 2005, 2006 Elad Efrat <elad@NetBSD.org>
  * Copyright (c) 2005, 2006 Brett Lymn <blymn@NetBSD.org>
  * All rights reserved.
+ *
  * 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
 @@ -19,27 +19,27 @@
  * THIS SOFTWARE IS PROVIDED BY THE AUTHORS ``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 AUTHORS 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.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: verified_exec.c,v 1.63 2007/12/11 12:16:14 lukem Exp $");
+__KERNEL_RCSID(0, "$NetBSD: verified_exec.c,v 1.63.22.1 2008/12/18 00:56:27 snj Exp $");
 #include <sys/param.h>
 #include <sys/errno.h>
 #include <sys/conf.h>
 #include <sys/vnode.h>
 #include <sys/fcntl.h>
 #include <sys/namei.h>
 #include <sys/verified_exec.h>
 #include <sys/kauth.h>
 #include <sys/syslog.h>
 #include <sys/proc.h>
 #ifdef __FreeBSD__
 @@ -118,89 +118,101 @@ veriexecopen(dev_t dev, int flags, int f
 static int
 veriexecclose(dev_t dev, int flags, int fmt, struct lwp *l)
+{
 	if (veriexec_dev_usage > 0)
 		veriexec_dev_usage--;
 	return (0);
+}
 static int
 veriexec_delete(prop_dictionary_t dict, struct lwp *l)
+{
 	struct nameidata nid;
 	const char *file;
 	int error;
-	NDINIT(&nid, LOOKUP, FOLLOW, UIO_SYSSPACE,
+	if (!prop_dictionary_get_cstring_nocopy(dict, "file", &file))
-	    prop_string_cstring_nocopy(prop_dictionary_get(dict, "file")));
+		return (EINVAL);
 	NDINIT(&nid, LOOKUP, FOLLOW, UIO_SYSSPACE, file);
 	error = namei(&nid);
 	if (error)
 		return (error);
 	/* XXX this should be done differently... */
 	if (nid.ni_vp->v_type == VREG)
 		error = veriexec_file_delete(l, nid.ni_vp);
 	else if (nid.ni_vp->v_type == VDIR)
 		error = veriexec_table_delete(l, nid.ni_vp->v_mount);
 	vrele(nid.ni_vp);
 	return (error);
+}
 static int
 veriexec_query(prop_dictionary_t dict, prop_dictionary_t rdict, struct lwp *l)
+{
 	struct nameidata nid;
 	const char *file;
 	int error;
-	NDINIT(&nid, LOOKUP, FOLLOW, UIO_SYSSPACE,
+	if (!prop_dictionary_get_cstring_nocopy(dict, "file", &file))
-	    prop_string_cstring_nocopy(prop_dictionary_get(dict, "file")));
+		return (EINVAL);
 	NDINIT(&nid, LOOKUP, FOLLOW, UIO_SYSSPACE, file);
 	error = namei(&nid);
 	if (error)
 		return (error);
 	error = veriexec_convert(nid.ni_vp, rdict);
 	vrele(nid.ni_vp);
 	return (error);
+}
 int
 veriexecioctl(dev_t dev, u_long cmd, void *data, int flags, struct lwp *l)
+{
 	extern int veriexec_strict;
 	struct plistref *plistref;
 	prop_dictionary_t dict;
 	int error = 0;
 	/* XXX This should be replaced with a kauth(9) request. */
 	switch (cmd) {
 	case VERIEXEC_TABLESIZE:
 	case VERIEXEC_LOAD:
 	case VERIEXEC_DELETE:
 	case VERIEXEC_FLUSH:
 		if (!(flags & FWRITE))
 			return (EPERM);
 		if (veriexec_strict > VERIEXEC_LEARNING) {
 			log(LOG_WARNING, "Veriexec: Strict mode, modifying "
 			    "tables not permitted.\n");
 			return (EPERM);
+		}
 		break;
 	case VERIEXEC_QUERY:
 	case VERIEXEC_DUMP:
 		if (!(flags & FREAD))
 			return (EPERM);
 		break;
 	default:
 		/* Invalid operation. */
 		return (ENODEV);
+	}
 	plistref = (struct plistref *)data;
 	switch (cmd) {
 	case VERIEXEC_TABLESIZE:
 		/* Do nothing. Kept for binary compatibility. */
 		break;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: kern_verifiedexec.c,v 1.111 2008/10/23 13:18:14 blymn Exp $	*/
+/*	$NetBSD: kern_verifiedexec.c,v 1.111.4.1 2008/12/18 00:56:27 snj Exp $	*/
 /*-
  * Copyright (c) 2005, 2006 Elad Efrat <elad@NetBSD.org>
  * Copyright (c) 2005, 2006 Brett Lymn <blymn@NetBSD.org>
  * All rights reserved.
+ *
  * 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
 @@ -19,27 +19,27 @@
  * THIS SOFTWARE IS PROVIDED BY THE AUTHORS ``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 AUTHORS 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.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_verifiedexec.c,v 1.111 2008/10/23 13:18:14 blymn Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_verifiedexec.c,v 1.111.4.1 2008/12/18 00:56:27 snj Exp $");
 #include "opt_veriexec.h"
 #include <sys/param.h>
 #include <sys/mount.h>
 #include <sys/kmem.h>
 #include <sys/vnode.h>
 #include <sys/namei.h>
 #include <sys/exec.h>
 #include <sys/once.h>
 #include <sys/proc.h>
 #include <sys/rwlock.h>
 #include <sys/syslog.h>
 @@ -1175,27 +1175,28 @@ veriexec_table_add(struct lwp *l, struct
  * Add a file to be monitored by Veriexec.
+ *
  * Expected elements in dict: file, fp, fp-type, entry-type.
  */
 int
 veriexec_file_add(struct lwp *l, prop_dictionary_t dict)
+{
 	struct veriexec_table_entry *vte;
 	struct veriexec_file_entry *vfe = NULL, *hh;
 	struct nameidata nid;
 	const char *file, *fp_type;
 	int error;
-	file = prop_string_cstring_nocopy(prop_dictionary_get(dict, "file"));
+	if (!prop_dictionary_get_cstring_nocopy(dict, "file", &file))
 		return (EINVAL);
 	NDINIT(&nid, LOOKUP, FOLLOW, UIO_SYSSPACE, file);
 	error = namei(&nid);
 	if (error)
 		return (error);
 	/* Add only regular files. */
 	if (nid.ni_vp->v_type != VREG) {
 		log(LOG_ERR, "Veriexec: Not adding `%s': Not a regular file.\n",
 		    file);
 		error = EBADF;