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

revert; but still fix the comment

This commit is contained in:
maxv 2015-08-08 06:24:40 +00:00
parent d6a4bdd595
commit 6a1d6f071c
1 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
sys/kern/exec_elf.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: exec_elf.c,v 1.75 2015/08/05 15:58:01 maxv Exp $ */
/* $NetBSD: exec_elf.c,v 1.76 2015/08/08 06:24:40 maxv Exp $ */
/*-
* Copyright (c) 1994, 2000, 2005 The NetBSD Foundation, Inc.
@ -57,7 +57,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(1, "$NetBSD: exec_elf.c,v 1.75 2015/08/05 15:58:01 maxv Exp $");
__KERNEL_RCSID(1, "$NetBSD: exec_elf.c,v 1.76 2015/08/08 06:24:40 maxv Exp $");
#ifdef _KERNEL_OPT
#include "opt_pax.h"
@ -646,7 +646,7 @@ exec_elf_makecmds(struct lwp *l, struct exec_package *epp)
return error;
if (eh->e_type == ET_DYN)
/* PIE */
/* PIE, and some libs have an entry point */
is_dyn = true;
else if (eh->e_type != ET_EXEC)
return ENOEXEC;
@ -692,12 +692,6 @@ exec_elf_makecmds(struct lwp *l, struct exec_package *epp)
}
}
if (is_dyn && (interp == NULL)) {
/* PIEs must have an interpreter */
error = ENOEXEC;
goto bad;
}
/*
* On the same architecture, we may be emulating different systems.
* See which one will accept this executable.