Index: sys/uvm/uvm_mmap.c
===================================================================
RCS file: /cvsroot/src/sys/uvm/uvm_mmap.c,v
retrieving revision 1.166
diff -p -u -r1.166 uvm_mmap.c
--- sys/uvm/uvm_mmap.c	20 May 2017 07:27:15 -0000	1.166
+++ sys/uvm/uvm_mmap.c	26 Oct 2017 17:10:45 -0000
@@ -398,10 +398,12 @@ sys_mmap(struct lwp *l, const struct sys
 	}
 
 	maxprot = PAX_MPROTECT_MAXPROTECT(l, prot, extraprot, maxprot);
-	if (((prot | extraprot) & maxprot) != (prot | extraprot))
-		return EACCES;
+	if (((prot | extraprot) & maxprot) != (prot | extraprot)) {
+		error = EACCES;
+		goto out;
+	}
 	if ((error = PAX_MPROTECT_VALIDATE(l, prot)))
-		return error;
+		goto out;
 
 	pax_aslr_mmap(l, &addr, orig_addr, flags);