Author: kib
Date: Sat Mar 30 10:03:26 2019
New Revision: 345730
URL: https://svnweb.freebsd.org/changeset/base/345730
Log:
MFC r345452:
ASLR: check for max_addr after applying randomization, not before.
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 Sat Mar 30 09:24:06 2019 (r345729)
+++ stable/12/sys/vm/vm_map.c Sat Mar 30 10:03:26 2019 (r345730)
@@ -1673,11 +1673,12 @@ again:
(max_addr == 0 || max_addr > MAP_32BIT_MAX_ADDR) ?
aslr_pages_rnd_64[pidx] : aslr_pages_rnd_32[pidx];
if (vm_map_findspace(map, curr_min_addr, length +
- gap * pagesizes[pidx], addr) ||
- (max_addr != 0 && *addr + length > max_addr))
+ gap * pagesizes[pidx], addr))
goto again;
/* And randomize the start address. */
*addr += (arc4random() % gap) * pagesizes[pidx];
+ if (max_addr != 0 && *addr + length > max_addr)
+ goto again;
} else if (vm_map_findspace(map, curr_min_addr, length, addr) ||
(max_addr != 0 && *addr + length > max_addr)) {
if (cluster) {
_______________________________________________
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"
