[src/trunk]: src/sys/uvm deal with COMPAT_10 issue.

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

details:   https://anonhg.NetBSD.org/src/rev/d8d9d340f67f
branches:  trunk
changeset: 326318:d8d9d340f67f
user:      christos <christos%NetBSD.org@localhost>
date:      Sat Jan 25 17:21:49 2014 +0000

description:
deal with COMPAT_10 issue.

diffstat:

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

diffs (37 lines):

diff -r 5072852e900b -r d8d9d340f67f sys/uvm/uvm_mmap.c
--- a/sys/uvm/uvm_mmap.c        Sat Jan 25 16:43:03 2014 +0000
+++ b/sys/uvm/uvm_mmap.c        Sat Jan 25 17:21:49 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: uvm_mmap.c,v 1.146 2014/01/25 05:14:03 christos Exp $  */
+/*     $NetBSD: uvm_mmap.c,v 1.147 2014/01/25 17:21:49 christos 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.146 2014/01/25 05:14:03 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uvm_mmap.c,v 1.147 2014/01/25 17:21:49 christos Exp $");
 
 #include "opt_compat_netbsd.h"
 #include "opt_pax.h"
@@ -334,8 +334,17 @@
         * Fixup the old deprecated MAP_COPY into MAP_PRIVATE, and
         * validate the flags.
         */
-       if (flags & MAP_COPY)
+       if (flags & MAP_COPY) {
                flags = (flags & ~MAP_COPY) | MAP_PRIVATE;
+#if defined(COMPAT_10) && defined(__i386__)
+               /*
+                * Ancient kernel on x86 did not obey PROT_EXEC on i386 at least
+                * and ld.so did not turn it on. We take care of this on amd64
+                * in compat32.
+                */
+               SCARG(&ua, prot) |= PROT_EXEC;
+#endif
+       }
        if ((flags & (MAP_SHARED|MAP_PRIVATE)) == (MAP_SHARED|MAP_PRIVATE))
                return (EINVAL);