diff options
| author |   visa <visa@openbsd.org> | 2017-11-14 14:43:39 +0000 |
|---|---|---|
| committer | visa <visa@openbsd.org> | 2017-11-14 14:43:39 +0000 |
| commit | bbac8ed528d9d1be7a573f2a821cfba174e0f8cf (patch) | |
| tree | 6a2744eca3b24da2d339bbfeedacb758792a703a | |
| parent | Add sizes for free() in the VIA PadLock driver. (diff) | |
| download | wireguard-openbsd-bbac8ed528d9d1be7a573f2a821cfba174e0f8cf.tar.xz wireguard-openbsd-bbac8ed528d9d1be7a573f2a821cfba174e0f8cf.zip | |
Fix the initial check of the checkorder and lock operations
so that statically initialized locks get properly enrolled
to the validator.
OK mpi@
| -rw-r--r-- | sys/kern/subr_witness.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/sys/kern/subr_witness.c b/sys/kern/subr_witness.c index 7387c50808a..967f2ffdbf5 100644 --- a/sys/kern/subr_witness.c +++ b/sys/kern/subr_witness.c @@ -1,4 +1,4 @@ -/* $OpenBSD: subr_witness.c,v 1.4 2017/08/12 03:13:23 guenther Exp $ */ +/* $OpenBSD: subr_witness.c,v 1.5 2017/11/14 14:43:39 visa Exp $ */ /*- * Copyright (c) 2008 Isilon Systems, Inc. @@ -30,8 +30,8 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * from BSDI $Id: subr_witness.c,v 1.4 2017/08/12 03:13:23 guenther Exp $ - * and BSDI $Id: subr_witness.c,v 1.4 2017/08/12 03:13:23 guenther Exp $ + * from BSDI $Id: subr_witness.c,v 1.5 2017/11/14 14:43:39 visa Exp $ + * and BSDI $Id: subr_witness.c,v 1.5 2017/11/14 14:43:39 visa Exp $ */ /* @@ -744,8 +744,8 @@ witness_checkorder(struct lock_object *lock, int flags, const char *file, struct witness *w, *w1; int i, j, s; - if (witness_cold || witness_watch < 1 || lock->lo_witness == NULL || - panicstr != NULL) + if (witness_cold || witness_watch < 1 || panicstr != NULL || + (lock->lo_flags & LO_WITNESS) == 0) return; w = lock->lo_witness; @@ -1078,8 +1078,8 @@ witness_lock(struct lock_object *lock, int flags, const char *file, int line) struct witness *w; int s; - if (witness_cold || witness_watch == -1 || lock->lo_witness == NULL || - panicstr != NULL) + if (witness_cold || witness_watch == -1 || panicstr != NULL || + (lock->lo_flags & LO_WITNESS) == 0) return; w = lock->lo_witness; |