Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/uvm MAP_COPY is handled in compat



details:   https://anonhg.NetBSD.org/src/rev/64b6050d2fa5
branches:  trunk
changeset: 823617:64b6050d2fa5
user:      christos <christos%NetBSD.org@localhost>
date:      Sat Apr 29 01:18:35 2017 +0000

description:
MAP_COPY is handled in compat

diffstat:

 sys/uvm/uvm_mmap.c |  19 ++-----------------
 1 files changed, 2 insertions(+), 17 deletions(-)

diffs (40 lines):

diff -r d9a208da41c0 -r 64b6050d2fa5 sys/uvm/uvm_mmap.c
--- a/sys/uvm/uvm_mmap.c        Sat Apr 29 01:17:47 2017 +0000
+++ b/sys/uvm/uvm_mmap.c        Sat Apr 29 01:18:35 2017 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: uvm_mmap.c,v 1.162 2016/08/09 12:17:04 kre Exp $       */
+/*     $NetBSD: uvm_mmap.c,v 1.163 2017/04/29 01:18:35 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.162 2016/08/09 12:17:04 kre Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uvm_mmap.c,v 1.163 2017/04/29 01:18:35 christos Exp $");
 
 #include "opt_compat_netbsd.h"
 #include "opt_pax.h"
@@ -312,21 +312,6 @@
        orig_addr = addr;
 #endif /* PAX_ASLR */
 
-       /*
-        * Fixup the old deprecated MAP_COPY into MAP_PRIVATE, and
-        * validate the flags.
-        */
-       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.
-                */
-               prot |= PROT_EXEC;
-#endif
-       }
        if ((flags & (MAP_SHARED|MAP_PRIVATE)) == (MAP_SHARED|MAP_PRIVATE))
                return EINVAL;
 



Home | Main Index | Thread Index | Old Index