diff --git a/sys/uvm/uvm_mmap.c b/sys/uvm/uvm_mmap.c
index 05d9a94504e89..04f341a9f744c 100644
--- a/sys/uvm/uvm_mmap.c
+++ b/sys/uvm/uvm_mmap.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: uvm_mmap.c,v 1.166 2017/05/20 07:27:15 chs Exp $	*/
+/*	$NetBSD: uvm_mmap.c,v 1.167 2017/10/27 12:01:08 utkarsh009 Exp $	*/
 
 /*
  * Copyright (c) 1997 Charles D. Cranor and Washington University.
@@ -46,7 +46,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uvm_mmap.c,v 1.166 2017/05/20 07:27:15 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uvm_mmap.c,v 1.167 2017/10/27 12:01:08 utkarsh009 Exp $");
 
 #include "opt_compat_netbsd.h"
 #include "opt_pax.h"
@@ -398,10 +398,12 @@ sys_mmap(struct lwp *l, const struct sys_mmap_args *uap, register_t *retval)
 	}
 
 	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);