summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormiod <miod@openbsd.org>2015-02-10 10:15:30 +0000
committermiod <miod@openbsd.org>2015-02-10 10:15:30 +0000
commitbedc359758a59993bb8858c960bce08c85c8daec (patch)
treefd364e0a66564ed8363659a40ead265ad668304f
parentremove #ifndef handling of __HAVE_MD_RWLOCK. it's never set, and with a (diff)
downloadwireguard-openbsd-bedc359758a59993bb8858c960bce08c85c8daec.tar.xz
wireguard-openbsd-bedc359758a59993bb8858c960bce08c85c8daec.zip
Enable `va < VM_MIN_ADDRESS' check now that VM_MIN_ADDRESS is nonzero.
-rw-r--r--sys/arch/m88k/m88k/trap.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/arch/m88k/m88k/trap.c b/sys/arch/m88k/m88k/trap.c
index 89d28383218..8099bbeaeb4 100644
--- a/sys/arch/m88k/m88k/trap.c
+++ b/sys/arch/m88k/m88k/trap.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: trap.c,v 1.101 2014/11/16 12:30:58 deraadt Exp $ */
+/* $OpenBSD: trap.c,v 1.102 2015/02/10 10:15:30 miod Exp $ */
/*
* Copyright (c) 2004, Miodrag Vallat.
* Copyright (c) 1998 Steve Murphree, Jr.
@@ -1757,7 +1757,7 @@ cache_flush(struct trapframe *tf)
va = tf->tf_r[2];
len = tf->tf_r[3];
- if (/* va < VM_MIN_ADDRESS || */ va >= VM_MAXUSER_ADDRESS ||
+ if (va < VM_MIN_ADDRESS || va >= VM_MAXUSER_ADDRESS ||
va + len <= va || va + len >= VM_MAXUSER_ADDRESS)
len = 0;