Author: markj
Date: Tue Nov 20 00:56:54 2018
New Revision: 340659
URL: https://svnweb.freebsd.org/changeset/base/340659

Log:
  MFC r340205:
  Avoid specifying VM_PROT_EXECUTE in mappings from pipe_map and exec_map.

Modified:
  stable/12/sys/kern/sys_pipe.c
  stable/12/sys/vm/vm_kern.c
Directory Properties:
  stable/12/   (props changed)

Modified: stable/12/sys/kern/sys_pipe.c
==============================================================================
--- stable/12/sys/kern/sys_pipe.c       Tue Nov 20 00:55:51 2018        
(r340658)
+++ stable/12/sys/kern/sys_pipe.c       Tue Nov 20 00:56:54 2018        
(r340659)
@@ -509,9 +509,8 @@ retry:
        size = round_page(size);
        buffer = (caddr_t) vm_map_min(pipe_map);
 
-       error = vm_map_find(pipe_map, NULL, 0,
-               (vm_offset_t *) &buffer, size, 0, VMFS_ANY_SPACE,
-               VM_PROT_ALL, VM_PROT_ALL, 0);
+       error = vm_map_find(pipe_map, NULL, 0, (vm_offset_t *)&buffer, size, 0,
+           VMFS_ANY_SPACE, VM_PROT_RW, VM_PROT_RW, 0);
        if (error != KERN_SUCCESS) {
                if ((cpipe->pipe_buffer.buffer == NULL) &&
                        (size > SMALL_PIPE_SIZE)) {

Modified: stable/12/sys/vm/vm_kern.c
==============================================================================
--- stable/12/sys/vm/vm_kern.c  Tue Nov 20 00:55:51 2018        (r340658)
+++ stable/12/sys/vm/vm_kern.c  Tue Nov 20 00:56:54 2018        (r340659)
@@ -650,8 +650,8 @@ kmap_alloc_wait(vm_map_t map, vm_size_t size)
                map->needs_wakeup = TRUE;
                vm_map_unlock_and_wait(map, 0);
        }
-       vm_map_insert(map, NULL, 0, addr, addr + size, VM_PROT_ALL,
-           VM_PROT_ALL, MAP_ACC_CHARGED);
+       vm_map_insert(map, NULL, 0, addr, addr + size, VM_PROT_RW, VM_PROT_RW,
+           MAP_ACC_CHARGED);
        vm_map_unlock(map);
        return (addr);
 }
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

Reply via email to