[src/netbsd-8]: src/sys/uvm Pull up following revision(s) (requested by chris...

[snj <snj%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/04cf861f7361
branches:  netbsd-8
changeset: 434371:04cf861f7361
user:      snj <snj%NetBSD.org@localhost>
date:      Thu Nov 02 21:39:18 2017 +0000

description:
Pull up following revision(s) (requested by christos in ticket #336):
        sys/uvm/uvm_mmap.c: revision 1.167
[syzkaller] Fix for PR #52658 as suggested by riastradh@
The bug was found by Dmitry Vyukov (dvyukov%google.com@localhost)
using syzkaller and was tested by me on a VM running
8.99.5

diffstat:

 sys/uvm/uvm_mmap.c |  12 +++++++-----
 1 files changed, 7 insertions(+), 5 deletions(-)

diffs (34 lines):

diff -r c7dc4ac18051 -r 04cf861f7361 sys/uvm/uvm_mmap.c
--- a/sys/uvm/uvm_mmap.c        Thu Nov 02 21:29:51 2017 +0000
+++ b/sys/uvm/uvm_mmap.c        Thu Nov 02 21:39:18 2017 +0000
@@ -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.166.2.1 2017/11/02 21:39:18 snj 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.166.2.1 2017/11/02 21:39:18 snj Exp $");
 
 #include "opt_compat_netbsd.h"
 #include "opt_pax.h"
@@ -398,10 +398,12 @@
        }
 
        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);