From 5930251a9d7fb9afa64fd2f0397e525628347f43 Mon Sep 17 00:00:00 2001 From: Konstantin Belousov Date: Wed, 28 May 2014 00:45:35 +0000 Subject: [PATCH] Remove the assert which can be triggered by the userspace. The situation checked by assert is verified to not take place in vm_map_wire(), and protection permissions on the wired entry can be revoked afterward. Reported by: markj Reviewed by: alc Sponsored by: The FreeBSD Foundation MFC after: 1 week --- sys/vm/vm_map.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/sys/vm/vm_map.c b/sys/vm/vm_map.c index 04f3bd5e930..200e38c74bf 100644 --- a/sys/vm/vm_map.c +++ b/sys/vm/vm_map.c @@ -1986,11 +1986,8 @@ vm_map_protect(vm_map_t map, vm_offset_t start, vm_offset_t end, */ if ((current->eflags & MAP_ENTRY_USER_WIRED) != 0 && (current->protection & VM_PROT_WRITE) != 0 && - (old_prot & VM_PROT_WRITE) == 0) { - KASSERT(old_prot != VM_PROT_NONE, - ("vm_map_protect: inaccessible wired map entry")); + (old_prot & VM_PROT_WRITE) == 0) vm_fault_copy_entry(map, map, current, current, NULL); - } /* * When restricting access, update the physical map. Worry