Module Name: src
Committed By: riastradh
Date: Mon Apr 27 20:21:19 UTC 2015
Modified Files:
src/sys/kern: kern_veriexec.c
Log Message:
KASSERT x then y, not (x && y).
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/sys/kern/kern_veriexec.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_veriexec.c
diff -u src/sys/kern/kern_veriexec.c:1.7 src/sys/kern/kern_veriexec.c:1.8
--- src/sys/kern/kern_veriexec.c:1.7 Mon Apr 27 09:17:31 2015
+++ src/sys/kern/kern_veriexec.c Mon Apr 27 20:21:19 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_veriexec.c,v 1.7 2015/04/27 09:17:31 maxv Exp $ */
+/* $NetBSD: kern_veriexec.c,v 1.8 2015/04/27 20:21:19 riastradh Exp $ */
/*-
* Copyright (c) 2005, 2006 Elad Efrat <e...@netbsd.org>
@@ -29,7 +29,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_veriexec.c,v 1.7 2015/04/27 09:17:31 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_veriexec.c,v 1.8 2015/04/27 20:21:19 riastradh Exp $");
#include "opt_veriexec.h"
@@ -428,8 +428,8 @@ veriexec_fp_calc(struct lwp *l, struct v
size_t resid, npages;
int error, do_perpage, pagen;
- KASSERT((file_lock_state != VERIEXEC_LOCKED) &&
- (file_lock_state != VERIEXEC_UNLOCKED));
+ KASSERT(file_lock_state != VERIEXEC_LOCKED);
+ KASSERT(file_lock_state != VERIEXEC_UNLOCKED);
if (file_lock_state == VERIEXEC_FILE_UNLOCKED)
vn_lock(vp, LK_SHARED | LK_RETRY);
@@ -645,8 +645,8 @@ veriexec_file_verify(struct lwp *l, stru
int error = 0;
KASSERT(rw_lock_held(&veriexec_op_lock));
- KASSERT((file_lock_state != VERIEXEC_LOCKED) &&
- (file_lock_state != VERIEXEC_UNLOCKED));
+ KASSERT(file_lock_state != VERIEXEC_LOCKED);
+ KASSERT(file_lock_state != VERIEXEC_UNLOCKED);
#define VFE_NEEDS_EVAL(vfe) ((vfe->status == FINGERPRINT_NOTEVAL) || \
(vfe->type & VERIEXEC_UNTRUSTED))
