dcb9c59cc2
Fix bsnmpd remote denial of service vulnerability. [SA-14:01] Fix ntpd distributed reflection Denial of Service vulnerability. [SA-14:02] Fix OpenSSL multiple vulnerabilities. [SA-14:03] Fix BIND remote denial of service vulnerability. [SA-14:04] Disable hardware RNGs by default. [EN-14:01] Fix incorrect coalescing of stack entry with mmap. [EN-14:02]
20 lines
758 B
Diff
20 lines
758 B
Diff
Index: sys/vm/vm_map.c
|
|
===================================================================
|
|
--- sys/vm/vm_map.c (revision 259950)
|
|
+++ sys/vm/vm_map.c (revision 259951)
|
|
@@ -1207,6 +1207,7 @@ charged:
|
|
}
|
|
else if ((prev_entry != &map->header) &&
|
|
(prev_entry->eflags == protoeflags) &&
|
|
+ (cow & (MAP_ENTRY_GROWS_DOWN | MAP_ENTRY_GROWS_UP)) == 0 &&
|
|
(prev_entry->end == start) &&
|
|
(prev_entry->wired_count == 0) &&
|
|
(prev_entry->cred == cred ||
|
|
@@ -3339,7 +3340,6 @@ vm_map_stack(vm_map_t map, vm_offset_t addrbos, vm
|
|
* NOTE: We explicitly allow bi-directional stacks.
|
|
*/
|
|
orient = cow & (MAP_STACK_GROWS_DOWN|MAP_STACK_GROWS_UP);
|
|
- cow &= ~orient;
|
|
KASSERT(orient != 0, ("No stack grow direction"));
|
|
|
|
if (addrbos < vm_map_min(map) ||
|