CVS commit: src/sys/kern

[Elad Efrat]

Module Name:    src
Committed By:   elad
Date:           Mon Dec 28 02:35:20 UTC 2009

Modified Files:
        src/sys/kern: kern_verifiedexec.c

Log Message:
Our error paths can call veriexec_file_free(), whicn in turn will try to
rw_destroy() the vfe lock. The easiest way to fix it for now is simply to
initialize the lock right after allocating the vfe...


To generate a diff of this commit:
cvs rdiff -u -r1.119 -r1.120 src/sys/kern/kern_verifiedexec.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


Modified files:

Index: src/sys/kern/kern_verifiedexec.c
diff -u src/sys/kern/kern_verifiedexec.c:1.119 src/sys/kern/kern_verifiedexec.c:1.120
--- src/sys/kern/kern_verifiedexec.c:1.119	Fri Dec 25 22:57:54 2009
+++ src/sys/kern/kern_verifiedexec.c	Mon Dec 28 02:35:20 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: kern_verifiedexec.c,v 1.119 2009/12/25 22:57:54 elad Exp $	*/
+/*	$NetBSD: kern_verifiedexec.c,v 1.120 2009/12/28 02:35:20 elad Exp $	*/
 
 /*-
  * Copyright (c) 2005, 2006 Elad Efrat <e...@netbsd.org>
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_verifiedexec.c,v 1.119 2009/12/25 22:57:54 elad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_verifiedexec.c,v 1.120 2009/12/28 02:35:20 elad Exp $");
 
 #include "opt_veriexec.h"
 
@@ -1168,6 +1168,8 @@
 
 	vfe = kmem_zalloc(sizeof(*vfe), KM_SLEEP);
 
+	rw_init(&vfe->lock);
+
 	/* Lookup fingerprint hashing algorithm. */
 	fp_type = prop_string_cstring_nocopy(prop_dictionary_get(dict,
 	    "fp-type"));
@@ -1256,7 +1258,6 @@
 	vfe->page_fp_status = PAGE_FP_NONE;
 	vfe->npages = 0;
 	vfe->last_page_size = 0;
-	rw_init(&vfe->lock);
 
 	vte = veriexec_table_lookup(vp->v_mount);
 	if (vte == NULL)