[src/trunk]: src/sys/kern Fix locking against self in veriexec_fp_calc().

[hannken <hannken%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/90257e97f4e7
branches:  trunk
changeset: 771425:90257e97f4e7
user:      hannken <hannken%NetBSD.org@localhost>
date:      Sun Nov 20 10:32:33 2011 +0000

description:
Fix locking against self in veriexec_fp_calc().

diffstat:

 sys/kern/kern_verifiedexec.c |  10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)

diffs (32 lines):

diff -r 84633740a8fa -r 90257e97f4e7 sys/kern/kern_verifiedexec.c
--- a/sys/kern/kern_verifiedexec.c      Sun Nov 20 07:43:52 2011 +0000
+++ b/sys/kern/kern_verifiedexec.c      Sun Nov 20 10:32:33 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: kern_verifiedexec.c,v 1.127 2011/10/14 09:23:31 hannken Exp $  */
+/*     $NetBSD: kern_verifiedexec.c,v 1.128 2011/11/20 10:32:33 hannken Exp $  */
 
 /*-
  * Copyright (c) 2005, 2006 Elad Efrat <elad%NetBSD.org@localhost>
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_verifiedexec.c,v 1.127 2011/10/14 09:23:31 hannken Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_verifiedexec.c,v 1.128 2011/11/20 10:32:33 hannken Exp $");
 
 #include "opt_veriexec.h"
 
@@ -411,9 +411,11 @@
        size_t resid, npages;
        int error, do_perpage, pagen;
 
-       vn_lock(vp, LK_SHARED | LK_RETRY);
+       if (lock_state == VERIEXEC_UNLOCKED)
+               vn_lock(vp, LK_SHARED | LK_RETRY);
        error = VOP_GETATTR(vp, &va, l->l_cred);
-       VOP_UNLOCK(vp);
+       if (lock_state == VERIEXEC_UNLOCKED)
+               VOP_UNLOCK(vp);
        if (error)
                return (error);