diff options
Diffstat (limited to 'share/security/patches/EN-15:20/vm.patch')
-rw-r--r-- | share/security/patches/EN-15:20/vm.patch | 30 |
1 files changed, 0 insertions, 30 deletions
diff --git a/share/security/patches/EN-15:20/vm.patch b/share/security/patches/EN-15:20/vm.patch deleted file mode 100644 index 05b566975c..0000000000 --- a/share/security/patches/EN-15:20/vm.patch +++ /dev/null @@ -1,30 +0,0 @@ ---- sys/vm/vm_map.c.orig -+++ sys/vm/vm_map.c -@@ -3969,12 +3969,10 @@ - vm_map_unlock_read(map); - return (KERN_PROTECTION_FAILURE); - } -- if ((entry->eflags & MAP_ENTRY_USER_WIRED) && -- (entry->eflags & MAP_ENTRY_COW) && -- (fault_type & VM_PROT_WRITE)) { -- vm_map_unlock_read(map); -- return (KERN_PROTECTION_FAILURE); -- } -+ KASSERT((prot & VM_PROT_WRITE) == 0 || (entry->eflags & -+ (MAP_ENTRY_USER_WIRED | MAP_ENTRY_NEEDS_COPY)) != -+ (MAP_ENTRY_USER_WIRED | MAP_ENTRY_NEEDS_COPY), -+ ("entry %p flags %x", entry, entry->eflags)); - if ((fault_typea & VM_PROT_COPY) != 0 && - (entry->max_protection & VM_PROT_WRITE) == 0 && - (entry->eflags & MAP_ENTRY_COW) == 0) { -@@ -4128,10 +4126,6 @@ - fault_type &= VM_PROT_READ | VM_PROT_WRITE | VM_PROT_EXECUTE; - if ((fault_type & prot) != fault_type) - return (KERN_PROTECTION_FAILURE); -- if ((entry->eflags & MAP_ENTRY_USER_WIRED) && -- (entry->eflags & MAP_ENTRY_COW) && -- (fault_type & VM_PROT_WRITE)) -- return (KERN_PROTECTION_FAILURE); - - /* - * If this page is not pageable, we have to get it for all possible |