From 1c35b08ea6922db17d2cb7809981aad7e9c3679a Mon Sep 17 00:00:00 2001
From: John Polstra <jdp@FreeBSD.org>
Date: Wed, 14 Oct 1998 16:16:50 +0000
Subject: [PATCH] Check the executable's header to make sure it is a valid
 executable. If it is ELF, print a diagnostic saying that it is not supported
 yet by this program.  This is a stop-gap anti-bug-report measure because it
 looks like there won't be time to implement gcore's ELF support before 3.0 is
 released.

---
 usr.bin/gcore/aoutcore.c | 10 +++++++++-
 usr.bin/gcore/gcore.c    | 10 +++++++++-
 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/usr.bin/gcore/aoutcore.c b/usr.bin/gcore/aoutcore.c
index a943a304c1b..8ab7b0bdbe6 100644
--- a/usr.bin/gcore/aoutcore.c
+++ b/usr.bin/gcore/aoutcore.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)gcore.c	8.2 (Berkeley) 9/23/93";
 #endif
 static const char rcsid[] =
-	"$Id: gcore.c,v 1.8 1998/08/24 16:25:30 wosch Exp $";
+	"$Id: gcore.c,v 1.9 1998/09/14 10:09:30 des Exp $";
 #endif /* not lint */
 
 /*
@@ -66,6 +66,7 @@ static const char rcsid[] =
 #include <machine/vmparam.h>
 
 #include <a.out.h>
+#include <elf.h>
 #include <err.h>
 #include <fcntl.h>
 #include <kvm.h>
@@ -174,6 +175,13 @@ main(argc, argv)
 	if (cnt != sizeof(exec))
 		errx(1, "%s exec header: %s",
 		    binfile, cnt > 0 ? strerror(EIO) : strerror(errno));
+	if (N_BADMAG(exec)) {
+		const Elf_Ehdr *ehdr = (const Elf_Ehdr *)&exec;
+
+		if (IS_ELF(*ehdr))
+			errx(1, "ELF executables are not supported yet");
+		errx(1, "Invalid executable file");
+	}
 
 	/* check the text segment size of the executable and the process */
 	if (exec.a_text != ptoa(ki->kp_eproc.e_vm.vm_tsize))
diff --git a/usr.bin/gcore/gcore.c b/usr.bin/gcore/gcore.c
index a943a304c1b..8ab7b0bdbe6 100644
--- a/usr.bin/gcore/gcore.c
+++ b/usr.bin/gcore/gcore.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)gcore.c	8.2 (Berkeley) 9/23/93";
 #endif
 static const char rcsid[] =
-	"$Id: gcore.c,v 1.8 1998/08/24 16:25:30 wosch Exp $";
+	"$Id: gcore.c,v 1.9 1998/09/14 10:09:30 des Exp $";
 #endif /* not lint */
 
 /*
@@ -66,6 +66,7 @@ static const char rcsid[] =
 #include <machine/vmparam.h>
 
 #include <a.out.h>
+#include <elf.h>
 #include <err.h>
 #include <fcntl.h>
 #include <kvm.h>
@@ -174,6 +175,13 @@ main(argc, argv)
 	if (cnt != sizeof(exec))
 		errx(1, "%s exec header: %s",
 		    binfile, cnt > 0 ? strerror(EIO) : strerror(errno));
+	if (N_BADMAG(exec)) {
+		const Elf_Ehdr *ehdr = (const Elf_Ehdr *)&exec;
+
+		if (IS_ELF(*ehdr))
+			errx(1, "ELF executables are not supported yet");
+		errx(1, "Invalid executable file");
+	}
 
 	/* check the text segment size of the executable and the process */
 	if (exec.a_text != ptoa(ki->kp_eproc.e_vm.vm_tsize))