CVS commit: src/sys/kern

[Elad Efrat]

Module Name:    src
Committed By:   elad
Date:           Mon Apr 20 22:09:55 UTC 2009

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

Log Message:
PR/41251: YAMAMOTO Takashi: veriexec locking seems broken

Part 1: Take the mountlist_lock before traversing the mount list.


To generate a diff of this commit:
cvs rdiff -u -r1.112 -r1.113 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.112 src/sys/kern/kern_verifiedexec.c:1.113
--- src/sys/kern/kern_verifiedexec.c:1.112	Sun Dec 14 23:20:23 2008
+++ src/sys/kern/kern_verifiedexec.c	Mon Apr 20 22:09:54 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: kern_verifiedexec.c,v 1.112 2008/12/14 23:20:23 elad Exp $	*/
+/*	$NetBSD: kern_verifiedexec.c,v 1.113 2009/04/20 22:09:54 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.112 2008/12/14 23:20:23 elad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_verifiedexec.c,v 1.113 2009/04/20 22:09:54 elad Exp $");
 
 #include "opt_veriexec.h"
 
@@ -1537,10 +1537,12 @@
 {
 	struct mount *mp;
 
+	mutex_enter(&mountlist_lock);
 	CIRCLEQ_FOREACH(mp, &mountlist, mnt_list) {
 		fileassoc_table_run(mp, veriexec_hook,
 		    (fileassoc_cb_t)veriexec_file_dump, rarray);
 	}
+	mutex_exit(&mountlist_lock);
 
 	return (0);
 }
@@ -1551,6 +1553,7 @@
 	struct mount *mp;
 	int error = 0;
 
+	mutex_enter(&mountlist_lock);
 	CIRCLEQ_FOREACH(mp, &mountlist, mnt_list) {
 		int lerror;
 
@@ -1558,6 +1561,7 @@
 		if (lerror && lerror != ENOENT)
 			error = lerror;
 	}
+	mutex_exit(&mountlist_lock);
 
 	return (error);
 }