 @@ -1,14 +1,14 @@
-/*	$NetBSD: kern_verifiedexec.c,v 1.131 2013/11/27 17:24:44 christos Exp $	*/
+/*	$NetBSD: kern_verifiedexec.c,v 1.132 2014/01/11 16:31:20 christos 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.131 2013/11/27 17:24:44 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_verifiedexec.c,v 1.132 2014/01/11 16:31:20 christos 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>
 @@ -1299,59 +1299,59 @@ veriexec_file_add(struct lwp *l, prop_di
 	vfe->status = FINGERPRINT_NOTEVAL;
 	if (prop_bool_true(prop_dictionary_get(dict, "keep-filename"))) {
 		vfe->filename_len = strlen(file) + 1;
 		vfe->filename = kmem_alloc(vfe->filename_len, KM_SLEEP);
 		strlcpy(vfe->filename, file, vfe->filename_len);
 	} else
 		vfe->filename = NULL;
 	vfe->page_fp = NULL;
 	vfe->page_fp_status = PAGE_FP_NONE;
 	vfe->npages = 0;
 	vfe->last_page_size = 0;
 	vte = veriexec_table_lookup(vp->v_mount);
 	if (vte == NULL)
 		vte = veriexec_table_add(l, vp->v_mount);
 	/* XXX if we bail below this, we might want to gc newly created vtes. */
 	error = fileassoc_add(vp, veriexec_hook, vfe);
 	if (error)
 		goto unlock_out;
 	vte->vte_count++;
 	if (prop_bool_true(prop_dictionary_get(dict, "eval-on-load")) ||
 	    (vfe->type & VERIEXEC_UNTRUSTED)) {
 		u_char *digest;
 		digest = kmem_zalloc(vfe->ops->hash_len, KM_SLEEP);
 		error = veriexec_fp_calc(l, vp, VERIEXEC_UNLOCKED,
 					 vfe, digest);
 		if (error) {
 			kmem_free(digest, vfe->ops->hash_len);
 			goto unlock_out;
+		}
 		if (veriexec_fp_cmp(vfe->ops, vfe->fp, digest) == 0)
 			vfe->status = FINGERPRINT_VALID;
 		else
 			vfe->status = FINGERPRINT_NOMATCH;
 		kmem_free(digest, vfe->ops->hash_len);
+	}
 	vte = veriexec_table_lookup(vp->v_mount);
 	if (vte == NULL)
 		vte = veriexec_table_add(l, vp->v_mount);
 	/* XXX if we bail below this, we might want to gc newly created vtes. */
 	error = fileassoc_add(vp, veriexec_hook, vfe);
 	if (error)
 		goto unlock_out;
 	vte->vte_count++;
 	veriexec_file_report(NULL, "New entry.", file, NULL, REPORT_DEBUG);
 	veriexec_bypass = 0;
   unlock_out:
 	rw_exit(&veriexec_op_lock);
   out:
 	vrele(vp);
 	if (error)
 		veriexec_file_free(vfe);
 	return (error);
+}