Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix a c&p bug when moving VM_DEFAULT_ADDRESS. (restore MAXDSIZ)

This commit is contained in:
matt 2003-02-27 23:10:52 +00:00
parent 452610ea39
commit 0731ed5a3d
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
sys/kern/exec_elf32.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: exec_elf32.c,v 1.83 2003/02/27 01:58:56 matt Exp $ */
/* $NetBSD: exec_elf32.c,v 1.84 2003/02/27 23:10:52 matt Exp $ */
/*-
* Copyright (c) 1994, 2000 The NetBSD Foundation, Inc.
@ -64,7 +64,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(1, "$NetBSD: exec_elf32.c,v 1.83 2003/02/27 01:58:56 matt Exp $");
__KERNEL_RCSID(1, "$NetBSD: exec_elf32.c,v 1.84 2003/02/27 23:10:52 matt Exp $");
/* If not included by exec_elf64.c, ELFSIZE won't be defined. */
#ifndef ELFSIZE
@ -414,7 +414,7 @@ ELFNAME(load_file)(struct proc *p, struct exec_package *epp, char *path,
/*
* Now compute the size and load address.
*/
addr = VM_DEFAULT_ADDRESS(epp->ep_daddr,
addr = VM_DEFAULT_ADDRESS(epp->ep_daddr + MAXDSIZ,
round_page(limit) - trunc_page(base_ph->p_vaddr));
} else
#endif /* !ELF_INTERP_NON_RELOCATABLE */
@ -469,11 +469,7 @@ ELFNAME(load_file)(struct proc *p, struct exec_package *epp, char *path,
eh.e_entry < (ph0->p_vaddr + size)) {
*entryoff = eh.e_entry - base_ph->p_vaddr;
}
/*
* This value is ignored if TOPDOWN.
*/
if (ph0->p_vaddr != 0)
addr += size;
addr += size;
break;
}