D28678.1794479353.diff
No OneTemporary
Actions

Authored By

Unknown

Size

806 B

Referenced Files

None

Subscribers

None

D28678.1794479353.diff
View Options

	diff --git a/sys/kern/imgact_elf.c b/sys/kern/imgact_elf.c
	--- a/sys/kern/imgact_elf.c
	+++ b/sys/kern/imgact_elf.c
	@@ -1287,7 +1287,8 @@
	maxv1 = maxv / 2 + addr / 2;
	MPASS(maxv1 >= addr); /* No overflow */
	map->anon_loc = __CONCAT(rnd_, __elfN(base))(map, addr, maxv1,
	- MAXPAGESIZES > 1 ? pagesizes[1] : pagesizes[0]);
	+ (MAXPAGESIZES > 1 && pagesizes[1] != 0) ?
	+ pagesizes[1] : pagesizes[0]);
	} else {
	map->anon_loc = addr;
	}
	@@ -1297,7 +1298,7 @@
	if (interp != NULL) {
	VOP_UNLOCK(imgp->vp);
	if ((map->flags & MAP_ASLR) != 0) {
	- /* Assume that interpeter fits into 1/4 of AS */
	+ /* Assume that interpreter fits into 1/4 of AS */
	maxv1 = maxv / 2 + addr / 2;
	MPASS(maxv1 >= addr); /* No overflow */
	addr = __CONCAT(rnd_, __elfN(base))(map, addr,