svn commit: r355541 - stable/12/sys/vm

[Mark Johnston]

Author: markj
Date: Mon Dec  9 00:34:34 2019
New Revision: 355541
URL: https://svnweb.freebsd.org/changeset/base/355541

Log:
  MFC r355469:
  Fix fault_type handling in vm_map_lookup().

Modified:
  stable/12/sys/vm/vm_map.c
Directory Properties:
  stable/12/   (props changed)

Modified: stable/12/sys/vm/vm_map.c
==============================================================================
--- stable/12/sys/vm/vm_map.c	Mon Dec  9 00:30:05 2019	(r355540)
+++ stable/12/sys/vm/vm_map.c	Mon Dec  9 00:34:34 2019	(r355541)
@@ -4525,7 +4525,7 @@ vm_map_lookup(vm_map_t *var_map,		/* IN/OUT */
 	vm_map_entry_t entry;
 	vm_map_t map = *var_map;
 	vm_prot_t prot;
-	vm_prot_t fault_type = fault_typea;
+	vm_prot_t fault_type;
 	vm_object_t eobject;
 	vm_size_t size;
 	struct ucred *cred;
@@ -4569,7 +4569,7 @@ RetryLookupLocked:
 		    vm_map_growstack(map, vaddr, entry) == KERN_SUCCESS)
 			goto RetryLookupLocked;
 	}
-	fault_type &= VM_PROT_READ | VM_PROT_WRITE | VM_PROT_EXECUTE;
+	fault_type = fault_typea & VM_PROT_ALL;
 	if ((fault_type & prot) != fault_type || prot == VM_PROT_NONE) {
 		vm_map_unlock_read(map);
 		return (KERN_PROTECTION_FAILURE);